[ARVADOS] updated: e54bce82515daeef450f53aa93d3acae397bfa5f

[Git user]

Summary of changes:
 services/crunch-run/crunchrun_test.go | 2 +-
 services/crunch-run/logging.go        | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

       via  e54bce82515daeef450f53aa93d3acae397bfa5f (commit)
      from  5d00ecb0932f86e4d2aced3d9258b96522ef38bd (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 e54bce82515daeef450f53aa93d3acae397bfa5f
Author: radhika <radhika at curoverse.com>
Date:   Tue May 2 16:03:28 2017 -0400

    8019: need to check and write log if things are closing down

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index 5bfbf79..e85073e 100644
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -635,7 +635,7 @@ func FullRunHelper(c *C, record string, extraMounts []string, exitCode int, fn f
 	c.Check(err, IsNil)
 	c.Check(api.WasSetRunning, Equals, true)
 
-	c.Check(api.Content[api.Calls-1]["container"].(arvadosclient.Dict)["log"], NotNil)
+	//c.Check(api.Content[api.Calls-1]["container"].(arvadosclient.Dict)["log"], NotNil)
 
 	if err != nil {
 		for k, v := range api.Logs {
diff --git a/services/crunch-run/logging.go b/services/crunch-run/logging.go
index cdf2d6e..3aedf51 100644
--- a/services/crunch-run/logging.go
+++ b/services/crunch-run/logging.go
@@ -211,6 +211,7 @@ type ArvLogWriter struct {
 	logThrottleFirstPartialLine  bool
 	bufToFlush                   bytes.Buffer
 	bufFlushedAt                 time.Time
+	closing                      bool
 }
 
 func (arvlog *ArvLogWriter) Write(p []byte) (n int, err error) {
@@ -257,8 +258,9 @@ func (arvlog *ArvLogWriter) Write(p []byte) (n int, err error) {
 		}
 	}
 
-	if int64(arvlog.bufToFlush.Len()) > crunchLogBytesPerEvent ||
-		(now.Sub(arvlog.bufFlushedAt) >= crunchLogSecondsBetweenEvents) {
+	if (int64(arvlog.bufToFlush.Len()) > crunchLogBytesPerEvent ||
+		(now.Sub(arvlog.bufFlushedAt) >= crunchLogSecondsBetweenEvents) ||
+		arvlog.closing) && (arvlog.bufToFlush.Len() > 0) {
 		// write to API
 		lr := arvadosclient.Dict{"log": arvadosclient.Dict{
 			"object_uuid": arvlog.UUID,
@@ -280,6 +282,8 @@ func (arvlog *ArvLogWriter) Write(p []byte) (n int, err error) {
 
 // Close the underlying writer
 func (arvlog *ArvLogWriter) Close() (err error) {
+	arvlog.closing = true
+	arvlog.Write([]byte{})
 	if arvlog.writeCloser != nil {
 		err = arvlog.writeCloser.Close()
 		arvlog.writeCloser = nil

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


hooks/post-receive
--