X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8445c610f4a03ac775a17ae20ac219fbbe63a6ab..85ee7f10d6aa8084da51a388011395c080842c70:/crunch_scripts/run-command

diff --git a/crunch_scripts/run-command b/crunch_scripts/run-command
index 520f5166d0..e6ec889bbc 100755
--- a/crunch_scripts/run-command
+++ b/crunch_scripts/run-command
@@ -49,9 +49,17 @@ subst.default_subs["node.cores"] = sub_cores
 rcode = 1
 
 def machine_progress(bytes_written, bytes_expected):
-    return "run-command: {} written {} total\n".format(
+    return "run-command: wrote {} total {}\n".format(
         bytes_written, -1 if (bytes_expected is None) else bytes_expected)
 
+class SigHandler(object):
+    def __init__(self):
+        self.sig = None
+
+    def send_signal(self, sp, signum):
+        sp.send_signal(signum)
+        self.sig = signum
+
 try:
     cmd = []
     for c in p["command"]:
@@ -66,54 +74,61 @@ try:
     print("run-command: {}{}".format(' '.join(cmd), (" > " + stdoutname) if stdoutname != None else ""))
 
     sp = subprocess.Popen(cmd, shell=False, stdout=stdoutfile)
+    sig = SigHandler()
 
     # forward signals to the process.
-    signal.signal(signal.SIGINT, lambda signum, frame: sp.send_signal(signum))
-    signal.signal(signal.SIGTERM, lambda signum, frame: sp.send_signal(signum))
-    signal.signal(signal.SIGQUIT, lambda signum, frame: sp.send_signal(signum))
+    signal.signal(signal.SIGINT, lambda signum, frame: sig.send_signal(sp, signum))
+    signal.signal(signal.SIGTERM, lambda signum, frame: sig.send_signal(sp, signum))
+    signal.signal(signal.SIGQUIT, lambda signum, frame: sig.send_signal(sp, signum))
 
     # wait for process to complete.
     rcode = sp.wait()
 
-    print("run-command: completed with exit code %i (%s)" % (rcode, "success" if rcode == 0 else "failed"))
+    if sig.sig != None:
+        print("run-command: terminating on signal %s" % sig.sig)
+        sys.exit(2)
+    else:
+        print("run-command: completed with exit code %i (%s)" % (rcode, "success" if rcode == 0 else "failed"))
 
 except Exception as e:
     print("run-command: caught exception: {}".format(e))
 
-finally:
-    # restore default signal handlers.
-    signal.signal(signal.SIGINT, signal.SIG_DFL)
-    signal.signal(signal.SIGTERM, signal.SIG_DFL)
-    signal.signal(signal.SIGQUIT, signal.SIG_DFL)
-
-    for l in links:
-        os.unlink(l)
-
-    print("run-command: the follow output files will be saved to keep:")
-
-    subprocess.call(["find", ".", "-type", "f", "-printf", "run-command: %12.12s %h/%f\\n"])
-
-    print("run-command: start writing output to keep")
-
-    done = False
-    resume_cache = put.ResumeCache(os.path.join(arvados.current_task().tmpdir, "upload-output-checkpoint"))
-    reporter = put.progress_writer(machine_progress)
-    bytes_expected = put.expected_bytes_for(".")
-    while not done:
-        try:
-            out = put.ArvPutCollectionWriter(resume_cache, reporter, bytes_expected)
-            out.do_queued_work()
-            out.write_directory_tree(".", max_manifest_depth=0)
-            outuuid = out.finish()
-            api.job_tasks().update(uuid=arvados.current_task()['uuid'],
-                                                 body={
-                                                     'output':outuuid,
-                                                     'success': (rcode == 0),
-                                                     'progress':1.0
-                                                 }).execute()
-            done = True
-        except Exception as e:
-            print("run-command: caught exception: {}".format(e))
-            time.sleep(5)
+# restore default signal handlers.
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+signal.signal(signal.SIGTERM, signal.SIG_DFL)
+signal.signal(signal.SIGQUIT, signal.SIG_DFL)
+
+for l in links:
+    os.unlink(l)
+
+print("run-command: the follow output files will be saved to keep:")
+
+subprocess.call(["find", ".", "-type", "f", "-printf", "run-command: %12.12s %h/%f\\n"])
+
+print("run-command: start writing output to keep")
+
+done = False
+resume_cache = put.ResumeCache(os.path.join(arvados.current_task().tmpdir, "upload-output-checkpoint"))
+reporter = put.progress_writer(machine_progress)
+bytes_expected = put.expected_bytes_for(".")
+while not done:
+    try:
+        out = put.ArvPutCollectionWriter.from_cache(resume_cache, reporter, bytes_expected)
+        out.do_queued_work()
+        out.write_directory_tree(".", max_manifest_depth=0)
+        outuuid = out.finish()
+        api.job_tasks().update(uuid=arvados.current_task()['uuid'],
+                                             body={
+                                                 'output':outuuid,
+                                                 'success': (rcode == 0),
+                                                 'progress':1.0
+                                             }).execute()
+        done = True
+    except KeyboardInterrupt:
+        print("run-command: terminating on signal 2")
+        sys.exit(2)
+    except Exception as e:
+        print("run-command: caught exception: {}".format(e))
+        time.sleep(5)
 
 sys.exit(rcode)