[ARVADOS] updated: 1.3.0-3041-gda85d6516

[Git user]

Summary of changes:
 lib/dispatchcloud/worker/pool.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

       via  da85d6516630d06ae3c34b4a52dc5ddff9fd5ace (commit)
      from  baa1f256924655d67b704f35981e9839743fab99 (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 da85d6516630d06ae3c34b4a52dc5ddff9fd5ace
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Mon Aug 31 15:34:22 2020 -0400

    16739: Fix using two different throttles.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go
index 2d958d837..ec6a049e6 100644
--- a/lib/dispatchcloud/worker/pool.go
+++ b/lib/dispatchcloud/worker/pool.go
@@ -170,9 +170,6 @@ type Pool struct {
 	runnerMD5    [md5.Size]byte
 	runnerCmd    string
 
-	throttleCreate    throttle
-	throttleInstances throttle
-
 	mContainersRunning prometheus.Gauge
 	mInstances         *prometheus.GaugeVec
 	mInstancesPrice    *prometheus.GaugeVec
@@ -307,7 +304,7 @@ func (wp *Pool) Create(it arvados.InstanceType) bool {
 	}
 	wp.mtx.Lock()
 	defer wp.mtx.Unlock()
-	if time.Now().Before(wp.atQuotaUntil) || wp.throttleCreate.Error() != nil {
+	if time.Now().Before(wp.atQuotaUntil) || wp.instanceSet.throttleCreate.Error() != nil {
 		return false
 	}
 	// The maxConcurrentNodeCreateOps knob throttles the number of node create

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


hooks/post-receive
--