X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/76d932c4916d15c2ca2668409905da4206cb38b3..9af0808e182e297b9c957c93f629016e1517eba1:/sdk/python/arvados/commands/ws.py

diff --git a/sdk/python/arvados/commands/ws.py b/sdk/python/arvados/commands/ws.py
index e0bf92f22a..9bce997107 100644
--- a/sdk/python/arvados/commands/ws.py
+++ b/sdk/python/arvados/commands/ws.py
@@ -6,70 +6,97 @@ import argparse
 import arvados
 import json
 from arvados.events import subscribe
+import signal
 
 def main(arguments=None):
     logger = logging.getLogger('arvados.arv-ws')
 
     parser = argparse.ArgumentParser()
-    parser.add_argument('-u', '--uuid', type=str, default="")
-    parser.add_argument('-f', '--filters', type=str, default="")
+    parser.add_argument('-u', '--uuid', type=str, default="", help="Filter events on object_uuid")
+    parser.add_argument('-f', '--filters', type=str, default="", help="Arvados query filter to apply to log events (JSON encoded)")
 
-    group = parser.add_argument_group('Polling fallback')
-    group.add_argument('--poll-fallback', default=15)
-    group.add_argument('--no-poll-fallback', action='store_false', dest='poll_fallback')
+    group = parser.add_mutually_exclusive_group()
+    group.add_argument('--poll-interval', default=15, type=int, help="If websockets is not available, specify the polling interval, default is every 15 seconds")
+    group.add_argument('--no-poll', action='store_false', dest='poll_interval', help="Do not poll if websockets are not available, just fail")
 
-    group = parser.add_argument_group('Jobs and Pipelines')
-    group.add_argument('-p', '--pipeline', type=str, default="", help="Print log output from a pipeline and its jobs")
-    group.add_argument('-j', '--job', type=str, default="", help="Print log output from a job")
+    group = parser.add_mutually_exclusive_group()
+    group.add_argument('-p', '--pipeline', type=str, default="", help="Supply pipeline uuid, print log output from pipeline and its jobs")
+    group.add_argument('-j', '--job', type=str, default="", help="Supply job uuid, print log output from jobs")
 
     args = parser.parse_args(arguments)
 
+    global filters
+    global known_component_jobs
+    global ws
+
     filters = []
+    known_component_jobs = set()
+    ws = None
+
+    def update_subscribed_components(components):
+        global known_component_jobs
+        global filters
+        pipeline_jobs = set()
+        for c in components:
+            if "job" in components[c]:
+                pipeline_jobs.add(components[c]["job"]["uuid"])
+        if known_component_jobs != pipeline_jobs:
+            ws.unsubscribe(filters)
+            filters = [['object_uuid', 'in', [args.pipeline] + list(pipeline_jobs)]]
+            ws.subscribe([['object_uuid', 'in', [args.pipeline] + list(pipeline_jobs)]])
+            known_component_jobs = pipeline_jobs
+
+    api = arvados.api('v1')
+
     if args.uuid:
         filters += [ ['object_uuid', '=', args.uuid] ]
 
     if args.filters:
         filters += json.loads(args.filters)
 
-    if args.pipeline:
-        filters += [ ['object_uuid', '=', args.pipeline] ]
-
     if args.job:
-        filters += [ ['object_uuid', '=', args.job], ['event_type', 'in', ['stderr', 'stdout'] ] ]
+        filters += [ ['object_uuid', '=', args.job] ]
 
-    api = arvados.api('v1', cache=False)
+    if args.pipeline:
+        filters += [ ['object_uuid', '=', args.pipeline] ]
 
-    known_component_jobs = set()
     def on_message(ev):
+        global filters
+        global ws
+
         logger.debug(ev)
         if 'event_type' in ev and (args.pipeline or args.job):
             if ev['event_type'] in ('stderr', 'stdout'):
                 sys.stdout.write(ev["properties"]["text"])
             elif ev["event_type"] in ("create", "update"):
-                if args.job or ev["object_kind"] == "arvados#pipeline_instance":
+                if ev["object_kind"] == "arvados#pipelineInstance":
+                    update_subscribed_components(ev["properties"]["new_attributes"]["components"])
+
+                if ev["object_kind"] == "arvados#pipelineInstance" and args.pipeline:
+                    if ev["properties"]["new_attributes"]["state"] in ("Complete", "Failed", "Paused"):
+                        ws.close()
+
+                if ev["object_kind"] == "arvados#job" and args.job:
                     if ev["properties"]["new_attributes"]["state"] in ("Complete", "Failed", "Cancelled"):
-                        ws.close_connection()
-                if ev["object_kind"] == "arvados#pipeline_instance":
-                    pipeline_jobs = set()
-                    for c in ev["properties"]["new_attributes"]["components"]:
-                        if "job" in ev["properties"]["new_attributes"]["components"][c]:
-                            pipeline_jobs.add(ev["properties"]["new_attributes"]["components"][c]["job"]["uuid"])
-                    if known_component_jobs != pipeline_jobs:
-                        ws.unsubscribe(filters)
-                        filters = [['object_uuid', 'in', [args.pipeline] + list(pipeline_jobs)]]
-                        ws.subscribe([['object_uuid', 'in', [args.pipeline] + list(pipeline_jobs)]])
-                        known_component_jobs = pipeline_jobs
+                        ws.close()
+        elif 'status' in ev and ev['status'] == 200:
+            pass
         else:
             print json.dumps(ev)
 
-    ws = None
     try:
-        ws = subscribe(api, filters, lambda ev: on_message(ev), poll_fallback=args.poll_fallback)
-        ws.run_forever()
+        ws = subscribe(arvados.api('v1'), filters, on_message, poll_fallback=args.poll_interval)
+        if ws:
+            if args.pipeline:
+                c = api.pipeline_instances().get(uuid=args.pipeline).execute()
+                update_subscribed_components(c["components"])
+                if c["state"] in ("Complete", "Failed", "Paused"):
+                    ws.close()
+            ws.run_forever()
     except KeyboardInterrupt:
         pass
-    except Exception:
-        logger.exception('')
+    except Exception as e:
+        logger.error(e)
     finally:
         if ws:
-            ws.close_connection()
+            ws.close()