projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12746: Don't stop hoststat until after capturing output.
[arvados.git]
/
services
/
crunch-run
/
crunchrun.go
diff --git
a/services/crunch-run/crunchrun.go
b/services/crunch-run/crunchrun.go
index 807a481d36647124c6d24fa2421fa95d4df54bdc..705bea486b21797ea4c6523ba28e03dda4ad269c 100644
(file)
--- a/
services/crunch-run/crunchrun.go
+++ b/
services/crunch-run/crunchrun.go
@@
-588,14
+588,18
@@
func (runner *ContainerRunner) ProcessDockerAttach(containerReader io.Reader) {
runner.CrunchLog.Printf("error closing crunchstat logs: %v", err)
}
}
runner.CrunchLog.Printf("error closing crunchstat logs: %v", err)
}
}
+}
- if runner.hoststatReporter != nil {
- runner.hoststatReporter.Stop()
- err = runner.hoststatLogger.Close()
- if err != nil {
- runner.CrunchLog.Printf("error closing hoststat logs: %v", err)
- }
+func (runner *ContainerRunner) stopHoststat() error {
+ if runner.hoststatReporter == nil {
+ return nil
}
}
+ runner.hoststatReporter.Stop()
+ err := runner.hoststatLogger.Close()
+ if err != nil {
+ return fmt.Errorf("error closing hoststat logs: %v", err)
+ }
+ return nil
}
func (runner *ContainerRunner) startHoststat() {
}
func (runner *ContainerRunner) startHoststat() {
@@
-1532,6
+1536,7
@@
func (runner *ContainerRunner) Run() (err error) {
}
checkErr(runner.CaptureOutput())
}
checkErr(runner.CaptureOutput())
+ checkErr(runner.stopHoststat())
checkErr(runner.CommitLogs())
checkErr(runner.UpdateContainerFinal())
}()
checkErr(runner.CommitLogs())
checkErr(runner.UpdateContainerFinal())
}()