Merge pull request #76 from felix5572/master

fix script generation
deepmodeling · Jun 30, 2021 · 6985514 · 6985514
2 parents 4654086 + f9340fd
commit 6985514
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/dpdispatcher/machine.py b/dpdispatcher/machine.py
@@ -15,8 +15,8 @@
 """
 
 script_env_template="""
-echo 0 > {flag_job_task_fail}
 REMOTE_ROOT={remote_root}
+echo 0 > $REMOTE_ROOT/{flag_if_job_task_fail}
 test $? -ne 0 && exit 1
 
 {module_unload_part}
@@ -31,7 +31,7 @@
 test $? -ne 0 && exit 1
 if [ ! -f {task_tag_finished} ] ;then
   {command_env} ( {command} ) {log_err_part}
-  if test $? -eq 0; then touch {task_tag_finished}; else echo 1 > {flag_job_task_fail};fi
+  if test $? -eq 0; then touch {task_tag_finished}; else echo 1 > $REMOTE_ROOT/{flag_if_job_task_fail};fi
 fi &
 """
 
@@ -40,8 +40,8 @@
 test $? -ne 0 && exit 1
 
 wait
-FLAG_JOB_TASK_FAIL=$(cat {flag_job_task_fail})
-if test $FLAG_JOB_TASK_FAIL -eq 0; then touch {job_tag_finished}; else exit 1;fi
+FLAG_IF_JOB_TASK_FAIL=$(cat {flag_if_job_task_fail})
+if test $FLAG_IF_JOB_TASK_FAIL -eq 0; then touch {job_tag_finished}; else exit 1;fi
 """
 
 class Machine(object):
@@ -197,10 +197,10 @@ def gen_script_env(self, job):
         for k,v in envs.items():
             export_envs_part += f"export {k}={v}\n"
 
-        flag_job_task_fail = job.job_hash + '_flag_job_task_fail'
+        flag_if_job_task_fail = job.job_hash + '_flag_if_job_task_fail'
 
         script_env = script_env_template.format(
-            flag_job_task_fail=flag_job_task_fail,
+            flag_if_job_task_fail=flag_if_job_task_fail,
             remote_root=self.context.remote_root,
             module_unload_part=module_unload_part,
             module_load_part=module_load_part,
@@ -225,9 +225,9 @@ def gen_script_command(self, job):
             if task.errlog is not None:
                 log_err_part += f"2>>{task.errlog} "
 
-            flag_job_task_fail = job.job_hash + '_flag_job_task_fail'
+            flag_if_job_task_fail = job.job_hash + '_flag_if_job_task_fail'
             single_script_command = script_command_template.format(
-                flag_job_task_fail=flag_job_task_fail,
+                flag_if_job_task_fail=flag_if_job_task_fail,
                 command_env=command_env,
                 task_work_path=task.task_work_path,
                 command=task.command,
@@ -240,10 +240,10 @@ def gen_script_command(self, job):
 
     def gen_script_end(self, job):
         job_tag_finished = job.job_hash + '_job_tag_finished'
-        flag_job_task_fail = job.job_hash + '_flag_job_task_fail'
+        flag_if_job_task_fail = job.job_hash + '_flag_if_job_task_fail'
         script_end = script_end_template.format(
             job_tag_finished=job_tag_finished,
-            flag_job_task_fail=flag_job_task_fail
+            flag_if_job_task_fail=flag_if_job_task_fail
         )
         return script_end