Change case.st_archive dependency string to not include strings indic…

…ating unsupported logic. Fix cobalt depend_string. Add depend_separator field to support LSF
ESMCI · Jul 20, 2017 · eb839ca · eb839ca
1 parent 89fbd14
commit eb839ca
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/config/acme/machines/config_batch.xml b/config/acme/machines/config_batch.xml
@@ -38,7 +38,8 @@
     <batch_submit>qsub</batch_submit>
     <batch_directive></batch_directive>
     <jobid_pattern>(\d+)</jobid_pattern>
-    <depend_string> --dependencies</depend_string>
+    <depend_string>--dependencies jobid</depend_string>
+    <depend_separator>:</depend_separator>
     <walltime_format>%H:%M:%s</walltime_format>
     <batch_mail_flag>-M</batch_mail_flag>
     <batch_mail_type_flag></batch_mail_type_flag>
@@ -58,7 +59,8 @@
     <batch_submit>qsub</batch_submit>
     <batch_directive>#COBALT</batch_directive>
     <jobid_pattern>(\d+)</jobid_pattern>
-    <depend_string> --dependencies</depend_string>
+    <depend_string>--dependencies jobid</depend_string>
+    <depend_separator>:</depend_separator>
     <batch_mail_flag>-M</batch_mail_flag>
     <batch_mail_type_flag></batch_mail_type_flag>
     <batch_mail_type></batch_mail_type>
@@ -77,7 +79,8 @@
     <batch_redirect>&lt;</batch_redirect>
     <batch_directive>#BSUB</batch_directive>
     <jobid_pattern>&lt;(\d+)&gt;</jobid_pattern>
-    <depend_string> -w 'done(jobid)'</depend_string>
+    <depend_string>-w 'ended(jobid)'</depend_string>
+    <depend_separator>&amp;&amp;</depend_separator>
     <walltime_format>%H:%M</walltime_format>
     <batch_mail_flag>-u</batch_mail_flag>
     <batch_mail_type_flag></batch_mail_type_flag>
@@ -103,7 +106,8 @@
     <batch_submit>qsub </batch_submit>
     <batch_directive>#PBS</batch_directive>
     <jobid_pattern>^(\S+)$</jobid_pattern>
-    <depend_string> -W depend=afterok:jobid</depend_string>
+    <depend_string>-W depend=afterany:jobid</depend_string>
+    <depend_separator>:</depend_separator>
     <walltime_format>%H:%M:%S</walltime_format>
     <batch_mail_flag>-M</batch_mail_flag>
     <batch_mail_type_flag>-m</batch_mail_type_flag>
@@ -127,7 +131,8 @@
     <batch_submit>msub </batch_submit>
     <batch_directive>#MSUB</batch_directive>
     <jobid_pattern>(\d+)$</jobid_pattern>
-    <depend_string> -W depend=afterok:jobid</depend_string>
+    <depend_string>-W depend=afterany:jobid</depend_string>
+    <depend_separator>:</depend_separator>
     <walltime_format>%H:%M:%S</walltime_format>
     <batch_mail_flag>-M</batch_mail_flag>
     <batch_mail_type_flag>-m</batch_mail_type_flag>
@@ -149,7 +154,8 @@
      <batch_submit>msub</batch_submit>
      <batch_directive>#MSUB</batch_directive>
      <jobid_pattern>(\d+)$</jobid_pattern>
-     <depend_string> -l depend=jobid</depend_string>
+     <depend_string>-l depend=jobid</depend_string>
+    <depend_separator>:</depend_separator>
     <walltime_format>%H:%M:%S</walltime_format>
      <directives>
        <directive>-V</directive>
@@ -172,7 +178,8 @@
     <batch_submit>sbatch</batch_submit>
     <batch_directive>#SBATCH</batch_directive>
     <jobid_pattern>(\d+)$</jobid_pattern>
-    <depend_string> --dependency=afterok:jobid</depend_string>
+    <depend_string>--dependency=afterany:jobid</depend_string>
+    <depend_separator>:</depend_separator>
     <walltime_format>%H:%M:%S</walltime_format>
     <batch_mail_flag>--mail-user</batch_mail_flag>
     <batch_mail_type_flag>--mail-type</batch_mail_type_flag>
@@ -454,8 +461,10 @@
     <job name="case.st_archive">
       <template>template.st_archive</template>
       <task_count>1</task_count>
-      <!-- If DOUT_S is true and case.run (or case.test) exits successfully then run st_archive-->
-      <dependency>case.run or case.test</dependency>
+      <!-- If DOUT_S is true and case.run amd/or case.test exits (regardless of success) then run st_archive
+	   This dependence is 'and' if both are run before case.st, and is 'or' if one is not run
+      -->
+      <dependency>case.run case.test</dependency>
       <prereq>$DOUT_S</prereq>
     </job>
   </batch_jobs>

diff --git a/config/xml_schemas/config_batch.xsd b/config/xml_schemas/config_batch.xsd
@@ -14,6 +14,7 @@
   <xs:element name="batch_directive" type="xs:string"/>
   <xs:element name="jobid_pattern" type="xs:string"/>
   <xs:element name="depend_string" type="xs:string"/>
+  <xs:element name="depend_separator" type="xs:string"/>
   <xs:element name="walltime_format" type="xs:string"/>
   <xs:element name="batch_mail_flag" type="xs:string"/>
   <xs:element name="batch_mail_type_flag" type="xs:string"/>
@@ -57,9 +58,12 @@
         <xs:element minOccurs="0" ref="jobid_pattern"/>
 
   <!-- depend_string: How to indicate to batch system that this job should not run until
-       a previous job has completed successfully -->
+       a previous job has completed (possibly unsuccessfully) -->
         <xs:element minOccurs="0" ref="depend_string"/>
 
+  <!-- depend_separator: How to separate multiple batch job dependencies -->
+        <xs:element minOccurs="0" ref="depend_separator"/>
+
   <!-- walltime_format: time format expected by batch system for the wall clock time field -->
         <xs:element minOccurs="0" ref="walltime_format"/>