[ARVADOS] created: 3beb006fd2c533a192379c9730a3a730c5493b90

[Git user]

        at  3beb006fd2c533a192379c9730a3a730c5493b90 (commit)


commit 3beb006fd2c533a192379c9730a3a730c5493b90
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Dec 20 11:10:56 2016 -0500

    10497: crunch-run records logs even when container is cancelled.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index ebee1a8..e13033e 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -751,10 +751,10 @@ func (runner *ContainerRunner) ContainerToken() (string, error) {
 func (runner *ContainerRunner) UpdateContainerFinal() error {
 	update := arvadosclient.Dict{}
 	update["state"] = runner.finalState
+	if runner.LogsPDH != nil {
+		update["log"] = *runner.LogsPDH
+	}
 	if runner.finalState == "Complete" {
-		if runner.LogsPDH != nil {
-			update["log"] = *runner.LogsPDH
-		}
 		if runner.ExitCode != nil {
 			update["exit_code"] = *runner.ExitCode
 		}

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


hooks/post-receive
--