Skip to content
Snippets Groups Projects

back out almapipe changes

Merged Charlotte Hausman requested to merge relocatable_workflows into main
1 file
+ 19
15
Compare changes
  • Side-by-side
  • Inline
@@ -281,12 +281,15 @@ class WorkflowService(WorkflowServiceIF):
:return: path to tmp folder
"""
vlapipe_id = 6000
if "remote-cv" in request.argument:
user_id = 9233
else:
user_id = 6000
temp_folder_path = self.processing_settings.rootDirectory
if not os.path.isdir(temp_folder_path):
os.mkdir(temp_folder_path)
temp_folder = Path(mkdtemp(dir=temp_folder_path))
os.chown(temp_folder, vlapipe_id, vlapipe_id)
os.chown(temp_folder, user_id, user_id)
logger.info("Settled on temp folder %s", temp_folder)
# set new directory as result_dir
request.results_dir = temp_folder.__str__()
@@ -485,20 +488,21 @@ class WorkflowService(WorkflowServiceIF):
sets gid and uid of subprocess to those of the submituser so that jobs can be
properly submitted
"""
if run_cv:
# run as almapipe
submituser_gid = 9233
submituser_uid = 9233
os.setgid(submituser_gid)
os.setuid(submituser_uid)
else:
# run as vlapipe
submituser_gid = 6000
submituser_uid = 6000
os.setgid(submituser_gid)
os.setuid(submituser_uid)
# if run_cv:
# run as almapipe
# submituser_gid = 9233
# submituser_uid = 9233
#
# os.setgid(submituser_gid)
# os.setuid(submituser_uid)
# else:
# run as vlapipe
submituser_gid = 6000
submituser_uid = 6000
os.setgid(submituser_gid)
os.setuid(submituser_uid)
@staticmethod
def _get_job_logfile_name(jobfile_name: Path) -> Path:
Loading