[ARVADOS] updated: 1.1.2-130-g1b7a6c0

Git user git at public.curoverse.com
Fri Jan 26 16:39:53 EST 2018


Summary of changes:
 services/crunch-run/crunchrun.go | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

       via  1b7a6c0ca4fa348c313a0862cfca597319cfe08f (commit)
      from  90bffaaf5e537608c3a8d2520544bfdd9b98d286 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1b7a6c0ca4fa348c313a0862cfca597319cfe08f
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Jan 26 16:30:50 2018 -0500

    12746: Don't stop hoststat until after capturing output.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 807a481..705bea4 100644
--- 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)
 		}
 	}
+}
 
-	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() {
@@ -1532,6 +1536,7 @@ func (runner *ContainerRunner) Run() (err error) {
 		}
 
 		checkErr(runner.CaptureOutput())
+		checkErr(runner.stopHoststat())
 		checkErr(runner.CommitLogs())
 		checkErr(runner.UpdateContainerFinal())
 	}()

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list