From: Tom Clegg <tom@curii.com>
Date: Mon, 6 Mar 2023 14:31:28 +0000 (-0500)
Subject: 20183: Don't do a periodic priority-update check at startup.
X-Git-Tag: 2.6.0~23^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/cd171959303236ba9a85e6524e6c40310203325b

20183: Don't do a periodic priority-update check at startup.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/controller/localdb/container.go b/lib/controller/localdb/container.go
index b87f9033d5..81f257181b 100644
--- a/lib/controller/localdb/container.go
+++ b/lib/controller/localdb/container.go
@@ -38,16 +38,16 @@ func (conn *Conn) runContainerPriorityUpdateThread(ctx context.Context) {
 	log := ctxlog.FromContext(ctx).WithField("worker", "runContainerPriorityUpdateThread")
 	ticker := time.NewTicker(5 * time.Minute)
 	for ctx.Err() == nil {
-		err := conn.containerPriorityUpdate(ctx, log)
-		if err != nil {
-			log.WithError(err).Warn("error updating container priorities")
-		}
 		select {
 		case <-ticker.C:
 		case <-conn.wantContainerPriorityUpdate:
 		case <-ctx.Done():
 			return
 		}
+		err := conn.containerPriorityUpdate(ctx, log)
+		if err != nil {
+			log.WithError(err).Warn("error updating container priorities")
+		}
 	}
 }