[ARVADOS] updated: cfa7968b0bf34ce7ba032492e18fe0e1ed77df9e

Git user git at public.curoverse.com
Thu Jul 28 13:49:17 EDT 2016


Summary of changes:
 README.md                                          |   2 +-
 build/run-tests.sh                                 |   4 +-
 sdk/cwl/arvados_cwl/__init__.py                    |  11 +-
 sdk/go/arvadostest/fixtures.go                     |   5 +-
 sdk/go/arvadostest/run_servers.go                  |  30 +-
 sdk/python/arvados/commands/keepdocker.py          |   7 +-
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go |  67 ++-
 .../crunch-dispatch-slurm_test.go                  |  86 +++-
 services/datamanager/datamanager_test.go           |  39 +-
 services/keep-balance/balance_run_test.go          |   2 +-
 services/keepstore/handlers.go                     |  18 +-
 services/keepstore/pull_worker.go                  |   5 +-
 services/keepstore/s3_volume.go                    | 487 ++++++++++++++++++---
 services/keepstore/s3_volume_test.go               | 217 ++++++++-
 services/keepstore/volume_generic_test.go          |  21 +-
 services/keepstore/volume_unix.go                  |  13 +-
 16 files changed, 874 insertions(+), 140 deletions(-)

       via  cfa7968b0bf34ce7ba032492e18fe0e1ed77df9e (commit)
       via  3381f02d88d4a35ba63226d76cba674aacfbe140 (commit)
       via  83a4494e66f4f7447091779f25e6f202b2379de9 (commit)
       via  86e1730f97383b3ae1685445323aa253b99ee821 (commit)
       via  7ba6bdf406546ec225baea49dbe6ccbf02e70f53 (commit)
       via  d65114fdee11cfd20833a96c34ebf5346baeb755 (commit)
       via  d9f2aaaa6b5762f448276ce96b6994245062a4c8 (commit)
       via  70e9fc0a1e57fb4d85d985b4c9258d7a5615b3bb (commit)
       via  e1f5b9c3c303502db7ef0e3c7a19c8edfbbb2183 (commit)
       via  482afcd3cda97329e68b2b77f7f4a32da6ea08ef (commit)
       via  78d74f846e1b35b6b65d76c345227845d00a9722 (commit)
       via  d137cbc6cfdcc541216e68d414c535626e4d8916 (commit)
       via  c15c0971e10534f36748feae87b1b73a386fd9b1 (commit)
       via  99b14829e38a823f37ff1f040c9f0777e42f0d67 (commit)
       via  e42bc5d373290314195c47ededb4fdacc90f7aa0 (commit)
       via  094024f2476d84a5b9a453ede79b243e1d282bab (commit)
       via  a6d2f88debdfa7bc390b63c1f18a0541987ae0b8 (commit)
       via  e8de69eac0308e5965bdbe13754764d4fea9b8b3 (commit)
       via  35ea47144857dc16ab8b6b8a272a87af6d50cb88 (commit)
       via  d858874f6c39bdcfbe3de383933aa4e68b2780f6 (commit)
       via  8db0d3197f659a4099e481b464cb9a877b943d3c (commit)
       via  1127e8884c809a35280d8e57dbe3bc1b8f8818a5 (commit)
       via  be87361dedf4e35405616e802fba12dedf86dfde (commit)
       via  70f8cb8fbc5cfce0f64adcfac181042390fcb3d6 (commit)
       via  4c98448b0966aefbf23b92f3da3a9278d2b73cab (commit)
       via  554dd04bce5a5955225609ef36a21b479b3a0f0a (commit)
      from  c9182d6e0acad983b782caaa84ec81cbf77b6dec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit cfa7968b0bf34ce7ba032492e18fe0e1ed77df9e
Author: radhika <radhika at curoverse.com>
Date:   Thu Jul 28 13:36:26 2016 -0400

    9552: add compute-checksum flag to arvados-cwl-runner

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 4bff093..bb0979a 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -35,7 +35,7 @@ class ArvCwlRunner(object):
 
     """
 
-    def __init__(self, api_client, work_api=None):
+    def __init__(self, api_client, work_api=None, compute_checksum=False):
         self.api = api_client
         self.processes = {}
         self.lock = threading.Lock()
@@ -46,6 +46,7 @@ class ArvCwlRunner(object):
         self.num_retries = 4
         self.uuid = None
         self.work_api = work_api
+        self.compute_checksum = compute_checksum
 
         if self.work_api is None:
             # todo: autodetect API to use.
@@ -127,7 +128,7 @@ class ArvCwlRunner(object):
         kwargs["use_container"] = True
         kwargs["tmpdir_prefix"] = "tmp"
         kwargs["on_error"] = "continue"
-        kwargs["compute_checksum"] = False
+        kwargs["compute_checksum"] = self.compute_checksum
 
         if self.work_api == "containers":
             kwargs["outdir"] = "/var/spool/cwl"
@@ -291,6 +292,10 @@ def arg_parser():  # type: () -> argparse.ArgumentParser
                         default=None, dest="work_api",
                         help="Select work submission API, one of 'jobs' or 'containers'.")
 
+    parser.add_argument("--compute-checksum", action="store_true", default=False,
+                        help="Compute checksum of contents while collecting outputs",
+                        dest="compute_checksum")
+
     parser.add_argument("workflow", type=str, nargs="?", default=None, help="The workflow to execute")
     parser.add_argument("job_order", nargs=argparse.REMAINDER, help="The input object to the workflow.")
 
@@ -308,7 +313,7 @@ def main(args, stdout, stderr, api_client=None):
     try:
         if api_client is None:
             api_client=arvados.api('v1', model=OrderedJsonModel())
-        runner = ArvCwlRunner(api_client, work_api=arvargs.work_api)
+        runner = ArvCwlRunner(api_client, work_api=arvargs.work_api, compute_checksum=arvargs.compute_checksum)
     except Exception as e:
         logger.error(e)
         return 1

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list