[ARVADOS] updated: 1.3.0-1133-g2f4429e62

[Git user]

Summary of changes:
 lib/dispatchcloud/dispatcher_test.go | 1 +
 lib/dispatchcloud/driver.go          | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

       via  2f4429e623199b9820d2296cf3788300caa7394b (commit)
       via  f1eabfdd91a3897234d395a1ad2046746dd7d3ff (commit)
      from  000158113f2c571ebac30d854b712d87c91e41cf (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 2f4429e623199b9820d2296cf3788300caa7394b
Merge: 000158113 f1eabfdd9
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Jun 21 16:37:46 2019 -0400

    Merge branch '15340-error-counters'
    
    refs #15340
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit f1eabfdd91a3897234d395a1ad2046746dd7d3ff
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Jun 21 16:12:56 2019 -0400

    15340: Fix uncounted Destroy ops.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index 6b73e71cc..07fdc6722 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 a8f3d5b5e..6162c81b6 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 {

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


hooks/post-receive
--