[ARVADOS] updated: f41ecc930361f296938308e46748c92407ecd812

git at public.curoverse.com git at public.curoverse.com
Wed Oct 8 17:31:09 EDT 2014


Summary of changes:
 sdk/cli/bin/arv-run-pipeline-instance              |   9 +-
 services/crunchstat/crunchstat.go                  | 160 +++++----
 services/nodemanager/.gitignore                    |   4 +
 services/nodemanager/arvnodeman/__init__.py        |   9 +
 services/nodemanager/arvnodeman/clientactor.py     |  96 ++++++
 .../nodemanager/arvnodeman/computenode/__init__.py | 383 +++++++++++++++++++++
 .../nodemanager/arvnodeman/computenode/dummy.py    |  52 +++
 services/nodemanager/arvnodeman/computenode/ec2.py | 101 ++++++
 services/nodemanager/arvnodeman/config.py          | 108 ++++++
 services/nodemanager/arvnodeman/daemon.py          | 294 ++++++++++++++++
 services/nodemanager/arvnodeman/jobqueue.py        |  96 ++++++
 services/nodemanager/arvnodeman/launcher.py        | 130 +++++++
 services/nodemanager/arvnodeman/nodelist.py        |  39 +++
 services/nodemanager/arvnodeman/timedcallback.py   |  41 +++
 services/nodemanager/bin/arvados-node-manager      |   6 +
 services/nodemanager/doc/ec2.example.cfg           | 121 +++++++
 services/nodemanager/doc/local.example.cfg         |  41 +++
 services/{fuse => nodemanager}/setup.py            |  26 +-
 services/{fuse => nodemanager}/tests/__init__.py   |   0
 services/nodemanager/tests/test_clientactor.py     | 127 +++++++
 services/nodemanager/tests/test_computenode.py     | 272 +++++++++++++++
 services/nodemanager/tests/test_computenode_ec2.py |  89 +++++
 services/nodemanager/tests/test_config.py          |  65 ++++
 services/nodemanager/tests/test_daemon.py          | 158 +++++++++
 services/nodemanager/tests/test_jobqueue.py        |  74 ++++
 services/nodemanager/tests/test_nodelist.py        |  56 +++
 services/nodemanager/tests/test_timedcallback.py   |  55 +++
 services/nodemanager/tests/testutil.py             |  81 +++++
 28 files changed, 2608 insertions(+), 85 deletions(-)
 create mode 100644 services/nodemanager/.gitignore
 create mode 100644 services/nodemanager/arvnodeman/__init__.py
 create mode 100644 services/nodemanager/arvnodeman/clientactor.py
 create mode 100644 services/nodemanager/arvnodeman/computenode/__init__.py
 create mode 100644 services/nodemanager/arvnodeman/computenode/dummy.py
 create mode 100644 services/nodemanager/arvnodeman/computenode/ec2.py
 create mode 100644 services/nodemanager/arvnodeman/config.py
 create mode 100644 services/nodemanager/arvnodeman/daemon.py
 create mode 100644 services/nodemanager/arvnodeman/jobqueue.py
 create mode 100644 services/nodemanager/arvnodeman/launcher.py
 create mode 100644 services/nodemanager/arvnodeman/nodelist.py
 create mode 100644 services/nodemanager/arvnodeman/timedcallback.py
 create mode 100644 services/nodemanager/bin/arvados-node-manager
 create mode 100644 services/nodemanager/doc/ec2.example.cfg
 create mode 100644 services/nodemanager/doc/local.example.cfg
 copy services/{fuse => nodemanager}/setup.py (63%)
 copy services/{fuse => nodemanager}/tests/__init__.py (100%)
 create mode 100644 services/nodemanager/tests/test_clientactor.py
 create mode 100644 services/nodemanager/tests/test_computenode.py
 create mode 100644 services/nodemanager/tests/test_computenode_ec2.py
 create mode 100644 services/nodemanager/tests/test_config.py
 create mode 100644 services/nodemanager/tests/test_daemon.py
 create mode 100644 services/nodemanager/tests/test_jobqueue.py
 create mode 100644 services/nodemanager/tests/test_nodelist.py
 create mode 100644 services/nodemanager/tests/test_timedcallback.py
 create mode 100644 services/nodemanager/tests/testutil.py

       via  f41ecc930361f296938308e46748c92407ecd812 (commit)
       via  bd58b7059dcc680006c8fa7105b2a295b1506210 (commit)
       via  44e01cf266a3c062b2f0f5bb3426672024367d38 (commit)
       via  a5687a390262abebfc16cf21e62052ac0019512d (commit)
       via  4be23b41ec561b404dd833bdbea9d764f2b5d027 (commit)
       via  9017317669b19883493fa18dc0c4900bab87ae96 (commit)
       via  501c5d20678de74fdce6618821659be41b3c0004 (commit)
       via  292856a6f1d26dcfd7a652a9a83cbe4a375588d4 (commit)
      from  f5c4a70c45d8a3826fede6e3ad2dad6030cc4438 (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 f41ecc930361f296938308e46748c92407ecd812
Merge: bd58b70 44e01cf
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 8 17:30:59 2014 -0400

    Merge branch 'master' into 4126-preserve-parameter-hash


commit bd58b7059dcc680006c8fa7105b2a295b1506210
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 8 17:28:38 2014 -0400

    4126: when parameter is a hash, use it as value if nothing else matches.

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 1ca6de9..4e8380d 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -446,12 +446,17 @@ class WhRunPipelineInstance
             ![false,'false',0,'0'].index parameter[:required]
           if parameter[:output_of]
             next
+          elsif parameter.is_a? Hash
+            value = parameter
+            next
           end
           errors << [componentname, parametername, "required parameter is missing"]
         end
         debuglog "parameter #{componentname}::#{parametername} == #{value}"
-        component[:script_parameters][parametername] =
-          parameter.dup.merge(value: value)
+
+        component[:script_parameters][parametername] = value
+        #component[:script_parameters][parametername] =
+        #  parameter.dup.merge(value: value)
       end
     end
     if !errors.empty?

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list