X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/48697cdb28fca37f1e420855a1bf1af2446184c7..df5588faa32a61d40968cf5c0ef50bdfb36985e3:/lib/crunchrun/crunchrun.go

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index 507dfc4dd7..3def8851ce 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -1431,14 +1431,25 @@ func (runner *ContainerRunner) saveLogCollection(final bool) (response arvados.C
 }
 
 // UpdateContainerRunning updates the container state to "Running"
-func (runner *ContainerRunner) UpdateContainerRunning() error {
+func (runner *ContainerRunner) UpdateContainerRunning(logId string) error {
 	runner.cStateLock.Lock()
 	defer runner.cStateLock.Unlock()
 	if runner.cCancelled {
 		return ErrCancelled
 	}
-	return runner.DispatcherArvClient.Update("containers", runner.Container.UUID,
-		arvadosclient.Dict{"container": arvadosclient.Dict{"state": "Running", "gateway_address": runner.gateway.Address}}, nil)
+	updates := arvadosclient.Dict{
+		"gateway_address": runner.gateway.Address,
+		"state":           "Running",
+	}
+	if logId != "" {
+		updates["log"] = logId
+	}
+	return runner.DispatcherArvClient.Update(
+		"containers",
+		runner.Container.UUID,
+		arvadosclient.Dict{"container": updates},
+		nil,
+	)
 }
 
 // ContainerToken returns the api_token the container (and any
@@ -1636,7 +1647,14 @@ func (runner *ContainerRunner) Run() (err error) {
 		return
 	}
 
-	err = runner.UpdateContainerRunning()
+	logCollection, err := runner.saveLogCollection(false)
+	var logId string
+	if err == nil {
+		logId = logCollection.PortableDataHash
+	} else {
+		runner.CrunchLog.Printf("Error committing initial log collection: %v", err)
+	}
+	err = runner.UpdateContainerRunning(logId)
 	if err != nil {
 		return
 	}