[ARVADOS] updated: 1.3.0-3171-g126139084

Git user git at public.arvados.org
Fri Sep 18 18:40:24 UTC 2020


Summary of changes:
 lib/dispatchcloud/worker/pool.go        | 3 ---
 lib/dispatchcloud/worker/worker_test.go | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

       via  126139084160563c2b4fe3969461c40ecbbf6951 (commit)
      from  799f8e333e7067cee0db0ee8bbcf45a56602d1f1 (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 126139084160563c2b4fe3969461c40ecbbf6951
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Sep 18 14:40:11 2020 -0400

    16838: implement review feedback.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go
index 78c51dee1..72d5ca56e 100644
--- a/lib/dispatchcloud/worker/pool.go
+++ b/lib/dispatchcloud/worker/pool.go
@@ -690,9 +690,6 @@ func (wp *Pool) registerMetrics(reg *prometheus.Registry) {
 		Help:       "Number of seconds per runProbe call.",
 		Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.95: 0.005, 0.99: 0.001},
 	}, []string{"outcome"})
-	for _, v := range []string{"success", "fail"} {
-		wp.mRunProbeDuration.WithLabelValues(v).Observe(0)
-	}
 	reg.MustRegister(wp.mRunProbeDuration)
 }
 
diff --git a/lib/dispatchcloud/worker/worker_test.go b/lib/dispatchcloud/worker/worker_test.go
index a4c2a6370..cfb7a1bfb 100644
--- a/lib/dispatchcloud/worker/worker_test.go
+++ b/lib/dispatchcloud/worker/worker_test.go
@@ -17,6 +17,7 @@ import (
 	"git.arvados.org/arvados.git/lib/dispatchcloud/test"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"github.com/prometheus/client_golang/prometheus"
 	check "gopkg.in/check.v1"
 )
 
@@ -239,6 +240,7 @@ func (suite *WorkerSuite) TestProbeAndUpdate(c *check.C) {
 			runnerData:       trial.deployRunner,
 			runnerMD5:        md5.Sum(trial.deployRunner),
 		}
+		wp.registerMetrics(prometheus.NewRegistry())
 		if trial.deployRunner != nil {
 			svHash := md5.Sum(trial.deployRunner)
 			wp.runnerCmd = fmt.Sprintf("/var/run/arvados/crunch-run~%x", svHash)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list