From f1eabfdd91a3897234d395a1ad2046746dd7d3ff Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 21 Jun 2019 16:12:56 -0400 Subject: [PATCH 1/1] 15340: Fix uncounted Destroy ops. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/dispatchcloud/dispatcher_test.go | 1 + lib/dispatchcloud/driver.go | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go index 6b73e71ccd..07fdc67228 100644 --- a/lib/dispatchcloud/dispatcher_test.go +++ b/lib/dispatchcloud/dispatcher_test.go @@ -202,6 +202,7 @@ func (s *DispatcherSuite) TestDispatchToStubDriver(c *check.C) { c.Check(resp.Code, check.Equals, http.StatusOK) c.Check(resp.Body.String(), check.Matches, `(?ms).*driver_operations{error="0",operation="Create"} [^0].*`) c.Check(resp.Body.String(), check.Matches, `(?ms).*driver_operations{error="0",operation="List"} [^0].*`) + c.Check(resp.Body.String(), check.Matches, `(?ms).*driver_operations{error="0",operation="Destroy"} [^0].*`) c.Check(resp.Body.String(), check.Matches, `(?ms).*driver_operations{error="1",operation="Create"} [^0].*`) c.Check(resp.Body.String(), check.Matches, `(?ms).*driver_operations{error="1",operation="List"} 0\n.*`) c.Check(resp.Body.String(), check.Matches, `(?ms).*instances_disappeared{state="shutdown"} [^0].*`) diff --git a/lib/dispatchcloud/driver.go b/lib/dispatchcloud/driver.go index a8f3d5b5ed..6162c81b63 100644 --- a/lib/dispatchcloud/driver.go +++ b/lib/dispatchcloud/driver.go @@ -150,7 +150,11 @@ func (is instrumentedInstanceSet) Create(it arvados.InstanceType, image cloud.Im func (is instrumentedInstanceSet) Instances(tags cloud.InstanceTags) ([]cloud.Instance, error) { instances, err := is.InstanceSet.Instances(tags) is.cv.WithLabelValues("List", boolLabelValue(err != nil)).Inc() - return instances, err + var instrumented []cloud.Instance + for _, i := range instances { + instrumented = append(instrumented, instrumentedInstance{i, is.cv}) + } + return instrumented, err } type instrumentedInstance struct { -- 2.30.2