ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-05-10 14:51:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix clearml.conf access in non-root containers

Browse Source
This commit is contained in:
allegroai 2022-05-05 12:23:11 +03:00
parent 335ef91d8e
commit c08e2ac0bb
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
clearml_agent/commands/worker.py
View File

@ -139,8 +139,8 @@ from clearml_agent.helper.singleton import Singleton
from clearml_agent.session import Session from clearml_agent.session import Session
from .events import Events from .events import Events
DOCKER_ROOT_CONF_FILE = "/root/clearml.conf" DOCKER_ROOT_CONF_FILE = "/tmp/clearml.conf" # assuming we can always access/mount this file
DOCKER_DEFAULT_CONF_FILE = "/root/default_clearml.conf" DOCKER_DEFAULT_CONF_FILE = "~/default_clearml.conf"
sys_random = random.SystemRandom() sys_random = random.SystemRandom()
@ -2002,7 +2002,7 @@ class Worker(ServiceCommandSection):
if entry_point == "clone_task" or entry_point == "reuse_task": if entry_point == "clone_task" or entry_point == "reuse_task":
change = 'ENTRYPOINT if [ ! -s "{trains_conf}" ] ; then ' \ change = 'ENTRYPOINT if [ ! -s "{trains_conf}" ] ; then ' \
'cp {default_trains_conf} {trains_conf} ; ' \ 'cp {default_trains_conf} {trains_conf} && export CLEARML_CONFIG_FILE={trains_conf}; ' \
' fi ; clearml-agent execute --id {task_id} --standalone-mode {clone}'.format( ' fi ; clearml-agent execute --id {task_id} --standalone-mode {clone}'.format(
default_trains_conf=DOCKER_DEFAULT_CONF_FILE, default_trains_conf=DOCKER_DEFAULT_CONF_FILE,
trains_conf=DOCKER_ROOT_CONF_FILE, trains_conf=DOCKER_ROOT_CONF_FILE,
@ -2380,6 +2380,10 @@ class Worker(ServiceCommandSection):
if sys.getfilesystemencoding() == 'ascii' and not os.environ.get("PYTHONIOENCODING"): if sys.getfilesystemencoding() == 'ascii' and not os.environ.get("PYTHONIOENCODING"):
os.environ["PYTHONIOENCODING"] = "utf-8" os.environ["PYTHONIOENCODING"] = "utf-8"
# check if we need to update backwards compatible OS environment
if not os.environ.get("TRAINS_CONFIG_FILE") and os.environ.get("CLEARML_CONFIG_FILE"):
os.environ["TRAINS_CONFIG_FILE"] = os.environ.get("CLEARML_CONFIG_FILE")
print("Starting Task Execution:\n".format(current_task.id)) print("Starting Task Execution:\n".format(current_task.id))
exit_code = -1 exit_code = -1
try: try:
@ -3690,6 +3694,7 @@ class Worker(ServiceCommandSection):
base_cmd += ( base_cmd += (
(['--name', name] if name else []) + (['--name', name] if name else []) +
['-v', conf_file+':'+DOCKER_ROOT_CONF_FILE] + ['-v', conf_file+':'+DOCKER_ROOT_CONF_FILE] +
['-e', "CLEARML_CONFIG_FILE={}".format(DOCKER_ROOT_CONF_FILE)] +
(['-v', host_ssh_cache+':'+mount_ssh] if host_ssh_cache else []) + (['-v', host_ssh_cache+':'+mount_ssh] if host_ssh_cache else []) +
(['-v', host_apt_cache+':'+mount_apt_cache] if host_apt_cache else []) + (['-v', host_apt_cache+':'+mount_apt_cache] if host_apt_cache else []) +
(['-v', host_pip_cache+':'+mount_pip_cache] if host_pip_cache else []) + (['-v', host_pip_cache+':'+mount_pip_cache] if host_pip_cache else []) +
@ -3780,12 +3785,17 @@ class Worker(ServiceCommandSection):
# patch venv folder to new location # patch venv folder to new location
script_dir = script_dir.replace(venv_folder, new_venv_folder) script_dir = script_dir.replace(venv_folder, new_venv_folder)
# New command line execution # New command line execution
command = RunasArgv('bash', '-c', 'HOME=\"{}\" PATH=\"{}\" PYTHONPATH=\"{}\" TRAINS_CONFIG_FILE={} {}'.format( command = RunasArgv(
home_folder, 'bash', '-c',
os.environ.get('PATH', '').replace(venv_folder, new_venv_folder), 'HOME=\"{}\" PATH=\"{}\" PYTHONPATH=\"{}\" '
os.environ.get('PYTHONPATH', '').replace(venv_folder, new_venv_folder), 'TRAINS_CONFIG_FILE={} CLEARML_CONFIG_FILE={} {}'.format(
user_trains_conf, home_folder,
command.serialize().replace(venv_folder, new_venv_folder))) os.environ.get('PATH', '').replace(venv_folder, new_venv_folder),
os.environ.get('PYTHONPATH', '').replace(venv_folder, new_venv_folder),
user_trains_conf, user_trains_conf,
command.serialize().replace(venv_folder, new_venv_folder)
)
)
command.set_uid(user_uid=user_uid, user_gid=user_uid) command.set_uid(user_uid=user_uid, user_gid=user_uid)
return command, script_dir return command, script_dir