[ARVADOS] updated: 1.3.0-3043-gb108bdfa0

[Git user]

Summary of changes:
 lib/dispatchcloud/worker/pool_test.go | 4 ++--
 lib/dispatchcloud/worker/throttle.go  | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

       via  b108bdfa0f3c74239fa565a1d14db945eb4dcf18 (commit)
      from  a5fef23f2863cd0183ff596f4579110e2ddb3b3d (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 b108bdfa0f3c74239fa565a1d14db945eb4dcf18
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Sep 1 10:23:33 2020 -0400

    16739: remove throttle.ResetError, update the err field directly from
           the test.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/dispatchcloud/worker/pool_test.go b/lib/dispatchcloud/worker/pool_test.go
index 7b116c3ee..a85f7383a 100644
--- a/lib/dispatchcloud/worker/pool_test.go
+++ b/lib/dispatchcloud/worker/pool_test.go
@@ -224,14 +224,14 @@ func (suite *PoolSuite) TestNodeCreateThrottle(c *check.C) {
 	c.Check(pool.Unallocated()[type1], check.Equals, 1)
 	c.Check(res, check.Equals, false)
 
-	pool.instanceSet.throttleCreate.ResetError()
+	pool.instanceSet.throttleCreate.err = nil
 	pool.maxConcurrentInstanceCreateOps = 2
 
 	res = pool.Create(type1)
 	c.Check(pool.Unallocated()[type1], check.Equals, 2)
 	c.Check(res, check.Equals, true)
 
-	pool.instanceSet.throttleCreate.ResetError()
+	pool.instanceSet.throttleCreate.err = nil
 	pool.maxConcurrentInstanceCreateOps = 0
 
 	res = pool.Create(type1)
diff --git a/lib/dispatchcloud/worker/throttle.go b/lib/dispatchcloud/worker/throttle.go
index 5374afb44..defbf91ff 100644
--- a/lib/dispatchcloud/worker/throttle.go
+++ b/lib/dispatchcloud/worker/throttle.go
@@ -61,12 +61,6 @@ func (thr *throttle) Error() error {
 	return thr.err
 }
 
-func (thr *throttle) ResetError() {
-	thr.mtx.Lock()
-	defer thr.mtx.Unlock()
-	thr.err = nil
-}
-
 type throttledInstanceSet struct {
 	cloud.InstanceSet
 	throttleCreate    throttle

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


hooks/post-receive
--