Skip to content
Snippets Groups Projects
Commit 9dde89a6 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Fixed bug in view log function for remote computing manager.

parent a812b1a2
No related branches found
No related tags found
No related merge requests found
...@@ -260,19 +260,20 @@ class RemoteComputingManager(ComputingManager): ...@@ -260,19 +260,20 @@ class RemoteComputingManager(ComputingManager):
def _get_task_log(self, task, **kwargs): def _get_task_log(self, task, **kwargs):
# Get computing host
host = task.computing.get_conf_param('host') # Get user keys
# Get id_rsa
if task.computing.require_user_keys: if task.computing.require_user_keys:
user_keys = Keys.objects.get(user=task.user, default=True) user_keys = Keys.objects.get(user=task.user, default=True)
id_rsa_file = user_keys.private_key_file
else: else:
raise NotImplementedError('Remote with no keys not yet') raise NotImplementedError('Remote tasks not requiring keys are not yet supported')
# Get computing host
host = task.computing.get_conf_param('master')
user = task.computing.get_conf_param('user')
# Stop the task remotely
view_log_command = 'ssh -i {} -4 -o StrictHostKeyChecking=no {}@{} \'/bin/bash -c "cat /tmp/{}.log"\''.format(user_keys.private_key_file, user, host, task.uuid)
# View the Singularity container log
view_log_command = 'ssh -i {} -4 -o StrictHostKeyChecking=no {} \'/bin/bash -c "cat /tmp/{}.log"\''.format(id_rsa_file, host, task.uuid)
logger.debug(view_log_command)
out = os_shell(view_log_command, capture=True) out = os_shell(view_log_command, capture=True)
if out.exit_code != 0: if out.exit_code != 0:
raise Exception(out.stderr) raise Exception(out.stderr)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment