[ARVADOS] updated: 1.1.0-195-g1f927c1

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

       via  1f927c19945fcdf02be92272cab888d512cb0a37 (commit)
      from  fbcedc4041edae0c1ff5367915bb75d60d47a99f (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 1f927c19945fcdf02be92272cab888d512cb0a37
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Nov 29 12:12:22 2017 -0500

    12614: Restore keepclient error check prior to NewContainerRunner()
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 180da0c..fc0dda7 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -1639,6 +1639,11 @@ func main() {
 	api.Retries = 8
 
 	kc, kcerr := keepclient.MakeKeepClient(api)
+	if kcerr != nil {
+		log.Fatalf("%s: %v", containerId, kcerr)
+	}
+	kc.BlockCache = &keepclient.BlockCache{MaxBlocks: 2}
+	kc.Retries = 4
 
 	// API version 1.21 corresponds to Docker 1.9, which is currently the
 	// minimum version we want to support.
@@ -1647,11 +1652,6 @@ func main() {
 
 	cr := NewContainerRunner(api, kc, dockerClientProxy, containerId)
 
-	if kcerr != nil {
-		cr.CrunchLog.Printf("%s: %v", containerId, kcerr)
-		cr.CrunchLog.Close()
-		os.Exit(1)
-	}
 	if dockererr != nil {
 		cr.CrunchLog.Printf("%s: %v", containerId, dockererr)
 		cr.checkBrokenNode(dockererr)
@@ -1659,8 +1659,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	kc.BlockCache = &keepclient.BlockCache{MaxBlocks: 2}
-	kc.Retries = 4
 	cr.statInterval = *statInterval
 	cr.cgroupRoot = *cgroupRoot
 	cr.expectCgroupParent = *cgroupParent

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


hooks/post-receive
--