[ARVADOS] updated: 1.3.0-1795-g4cadc4832

[Git user]

Summary of changes:
 lib/dispatchcloud/worker/runner.go      | 41 ++++++++++------
 lib/dispatchcloud/worker/worker_test.go |  2 +
 services/crunch-run/crunchrun.go        | 85 +++++++++++++++++++++++++--------
 3 files changed, 92 insertions(+), 36 deletions(-)

       via  4cadc4832ed4dd58e841628232c472e99b6f7d1b (commit)
       via  fd689ff480c77b2b5ba60c02f5522e794f190661 (commit)
       via  9481ff4a22314c0d5acffe78fbc7595278414e6f (commit)
      from  de6d121eac429a1dc65e3c3e646f45d54bcfcbf3 (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 4cadc4832ed4dd58e841628232c472e99b6f7d1b
Merge: de6d121ea fd689ff48
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Oct 24 14:22:04 2019 -0400

    Merge branch '15734-dispatchcloud-node-info'
    
    fixes #15734
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit fd689ff480c77b2b5ba60c02f5522e794f190661
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Oct 24 14:21:18 2019 -0400

    15734: Reword crunch-run compatibility comment.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/dispatchcloud/worker/runner.go b/lib/dispatchcloud/worker/runner.go
index 9cd1d8d6b..91db82460 100644
--- a/lib/dispatchcloud/worker/runner.go
+++ b/lib/dispatchcloud/worker/runner.go
@@ -35,11 +35,11 @@ type remoteRunner struct {
 // newRemoteRunner returns a new remoteRunner. Caller should ensure
 // Close() is called to release resources.
 func newRemoteRunner(uuid string, wkr *worker) *remoteRunner {
-	// In order to stay compatible with recent dev/experimental
-	// versions of crunch-run, we need to pass a map with string
-	// values only, so we JSON-encode the instance type
-	// record. Once worker images are updated we can skip this and
-	// just pass {"InstanceType": wkr.instType}.
+	// Early (<1.5) versions of crunch-run error out if they see
+	// non-string values in the env map -- so here we send the
+	// instance type record as a JSON doc. Once worker images are
+	// updated, we can skip the extra encoding, and just include
+	// {"InstanceType": wkr.instType} in the env map.
 	var instJSON bytes.Buffer
 	enc := json.NewEncoder(&instJSON)
 	enc.SetIndent("", "    ")

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


hooks/post-receive
--