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 8dc024c653810cf366fbf5ac22c4008f5cf55dfa..2e475c72e64842b15aa6c7dee88446bc0056b802 100644 (file)
--- 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
        }