[ARVADOS] created: 2a4fbc88b7a16a059b5eb62bf0a3f1b13ebfc72d

[Git user]

        at  2a4fbc88b7a16a059b5eb62bf0a3f1b13ebfc72d (commit)


commit 2a4fbc88b7a16a059b5eb62bf0a3f1b13ebfc72d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Dec 2 10:20:19 2016 -0500

    10658: Put container into cancelled state on error during docker load or mount
    setup.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 8dc024c..2e475c7 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -833,6 +833,7 @@ func (runner *ContainerRunner) Run() (err error) {
 	// check for and/or load image
 	err = runner.LoadImage()
 	if err != nil {
+		runner.finalState = "Cancelled"
 		err = fmt.Errorf("While loading container image: %v", err)
 		return
 	}
@@ -840,6 +841,7 @@ func (runner *ContainerRunner) Run() (err error) {
 	// set up FUSE mount and binds
 	err = runner.SetupMounts()
 	if err != nil {
+		runner.finalState = "Cancelled"
 		err = fmt.Errorf("While setting up mounts: %v", err)
 		return
 	}

commit 163fc733dbe7bd13212d7df6a1563edd6d8798f4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Dec 2 09:59:38 2016 -0500

    10658: Flush logs even when maintaining container in queued state.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index ade40c6..8dc024c 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -800,6 +800,7 @@ func (runner *ContainerRunner) Run() (err error) {
 		checkErr(err)
 
 		if runner.finalState == "Queued" {
+			runner.CrunchLog.Close()
 			runner.UpdateContainerFinal()
 			return
 		}

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


hooks/post-receive
--