Fixed the issue where CPU / Max RSS data is not available in the event of job failure

Author: ChrisPaulBennett

cylc/flow/etc/job.sh

@@ -164,14 +164,6 @@ cylc__job__main() {
         fi
     }
     # Grab the max rss and cpu_time value before moving directory
-    if [[ -f "max_rss" ]]; then
-      max_rss=$(cat max_rss)
-      rm max_rss
-    fi
-    if [[ -f "cpu_time" ]]; then
-      cpu_time=$(cat cpu_time)
-      rm cpu_time
-    fi
     cylc__kill_profiler
     # Empty work directory remove
     cd
@@ -208,6 +200,14 @@ cylc__set_return() {
 ###############################################################################
 # Save the data using cylc message and exit the profiler
 cylc__kill_profiler() {
+    if [[ -f "max_rss" ]]; then
+      max_rss=$(cat max_rss)
+      rm max_rss
+    fi
+    if [[ -f "cpu_time" ]]; then
+      cpu_time=$(cat cpu_time)
+      rm cpu_time
+    fi
     if [[ -n "${cpu_time:-}" ]]; then
       cylc message -- "${CYLC_WORKFLOW_ID}" "${CYLC_TASK_JOB}" "DEBUG: cpu_time $cpu_time" || true
     fi

tests/functional/jobscript/02-profiler.t

@@ -28,7 +28,7 @@ create_test_global_config "
   [[${CYLC_TEST_PLATFORM}]]
     [[[profile]]]
       activate = True
-      # TODO: set the interval to something like 1s
+      polling interval = 1
   [[localhost]]
     [[[profile]]]
       activate = True
@@ -50,7 +50,7 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
     [[the_bad]]
         # this task should fail (it should still send profiling info)
         platform = {{ environ['CYLC_TEST_PLATFORM'] }}
-        script = false
+        script = sleep 5; false
     [[the_ugly]]
         # this task should succeed despite the broken profiler configuration
         platform = localhost