From 6b89791e02d560934fb07ed8a24d447072c46313 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 25 Nov 2020 09:24:25 -0500 Subject: [PATCH 1/1] Share CR refresh throttle when running multiple containers. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- arvados.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arvados.go b/arvados.go index be11a2333d..5f78a36408 100644 --- a/arvados.go +++ b/arvados.go @@ -177,6 +177,8 @@ reconnect: } } +var refreshTicker = time.NewTicker(5 * time.Second) + type arvadosContainerRunner struct { Client *arvados.Client Name string @@ -268,9 +270,6 @@ func (runner *arvadosContainerRunner) RunContext(ctx context.Context) (string, e } }() - ticker := time.NewTicker(5 * time.Second) - defer ticker.Stop() - neednewline := "" lastState := cr.State @@ -311,7 +310,7 @@ waitctr: log.Errorf("error while trying to cancel container request %s: %s", cr.UUID, err) } break waitctr - case <-ticker.C: + case <-refreshTicker.C: refreshCR() case msg := <-logch: switch msg.EventType { -- 2.30.2