X-Git-Url: https://git.arvados.org/lightning.git/blobdiff_plain/9e753a193772550aec797c8cc55d2c75421b9b18..08aa5f2c415150de2738378b6d4fbce88a9e6a59:/arvados.go

diff --git a/arvados.go b/arvados.go
index e2932a00d2..68f275508d 100644
--- a/arvados.go
+++ b/arvados.go
@@ -15,6 +15,7 @@ import (
 	"net/url"
 	"os"
 	"regexp"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -177,7 +178,7 @@ reconnect:
 				}
 				client.mtx.Lock()
 				for ch := range client.notifying[msg.ObjectUUID] {
-					ch <- msg
+					go func() { ch <- msg }()
 				}
 				client.mtx.Unlock()
 			}
@@ -244,7 +245,7 @@ func (runner *arvadosContainerRunner) RunContext(ctx context.Context) (string, e
 		keepCache = 2
 	}
 	rc := arvados.RuntimeConstraints{
-		API:          &runner.APIAccess,
+		API:          runner.APIAccess,
 		VCPUs:        runner.VCPUs,
 		RAM:          runner.RAM,
 		KeepCacheRAM: (1 << 26) * int64(keepCache) * int64(runner.VCPUs),
@@ -297,14 +298,18 @@ func (runner *arvadosContainerRunner) RunContext(ctx context.Context) (string, e
 
 	lastState := cr.State
 	refreshCR := func() {
-		err = runner.Client.RequestAndDecode(&cr, "GET", "arvados/v1/container_requests/"+cr.UUID, nil, nil)
+		ctx, cancel := context.WithDeadline(ctx, time.Now().Add(time.Minute))
+		defer cancel()
+		err = runner.Client.RequestAndDecodeContext(ctx, &cr, "GET", "arvados/v1/container_requests/"+cr.UUID, nil, nil)
 		if err != nil {
 			fmt.Fprint(os.Stderr, neednewline)
+			neednewline = ""
 			log.Printf("error getting container request: %s", err)
 			return
 		}
 		if lastState != cr.State {
 			fmt.Fprint(os.Stderr, neednewline)
+			neednewline = ""
 			log.Printf("container request state: %s", cr.State)
 			lastState = cr.State
 		}
@@ -321,7 +326,7 @@ func (runner *arvadosContainerRunner) RunContext(ctx context.Context) (string, e
 		}
 	}
 
-	var reCrunchstat = regexp.MustCompile(`mem .* rss`)
+	var reCrunchstat = regexp.MustCompile(`mem .* (\d+) rss`)
 waitctr:
 	for cr.State != arvados.ContainerRequestStateFinal {
 		select {
@@ -351,9 +356,10 @@ waitctr:
 				}
 			case "crunchstat":
 				for _, line := range strings.Split(msg.Properties.Text, "\n") {
-					mem := reCrunchstat.FindString(line)
-					if mem != "" {
-						fmt.Fprintf(os.Stderr, "%s               \r", mem)
+					m := reCrunchstat.FindStringSubmatch(line)
+					if m != nil {
+						rss, _ := strconv.ParseInt(m[1], 10, 64)
+						fmt.Fprintf(os.Stderr, "%s rss %.3f GB           \r", cr.UUID, float64(rss)/1e9)
 						neednewline = "\n"
 					}
 				}