14325: Move magic number to const.
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 21 Jan 2019 20:19:53 +0000 (15:19 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 21 Jan 2019 20:19:53 +0000 (15:19 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

lib/dispatchcloud/worker/pool.go

index f9566241dda9b8c1b148bf77f73460d032d4343c..2c2d977d874227d8ebea67392b4665e03492a80e 100644 (file)
@@ -63,6 +63,10 @@ const (
        defaultTimeoutBooting     = time.Minute * 10
        defaultTimeoutProbe       = time.Minute * 10
        defaultTimeoutShutdown    = time.Second * 10
+
+       // Time after a quota error to try again anyway, even if no
+       // instances have been shutdown.
+       quotaErrorTTL = time.Minute
 )
 
 func duration(conf arvados.Duration, def time.Duration) time.Duration {
@@ -247,7 +251,7 @@ func (wp *Pool) Create(it arvados.InstanceType) error {
                }
                if err, ok := err.(cloud.QuotaError); ok && err.IsQuotaError() {
                        wp.atQuotaErr = err
-                       wp.atQuotaUntil = time.Now().Add(time.Minute)
+                       wp.atQuotaUntil = time.Now().Add(quotaErrorTTL)
                }
                if err != nil {
                        logger.WithError(err).Error("create failed")