From aaea192aabb8b5fbbd301151aa918425d7eabadc Mon Sep 17 00:00:00 2001 From: Willow Carretero Chavez Date: Tue, 18 Jun 2024 19:00:04 +0000 Subject: [PATCH] Always reset agent connection backoff and enter fast sync when client count < server count (#632) * Always reset backoff and enter fast sync when clien count < server count * Only call ClientsCount() once * Review comment --- pkg/agent/clientset.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/agent/clientset.go b/pkg/agent/clientset.go index 6a2510a84..635bae64d 100644 --- a/pkg/agent/clientset.go +++ b/pkg/agent/clientset.go @@ -183,9 +183,13 @@ func (cs *ClientSet) sync() { for { if err := cs.connectOnce(); err != nil { if dse, ok := err.(*DuplicateServerError); ok { - klog.V(4).InfoS("duplicate server", "serverID", dse.ServerID, "serverCount", cs.serverCount, "clientsCount", cs.ClientsCount()) - if cs.serverCount != 0 && cs.ClientsCount() >= cs.serverCount { + clientsCount := cs.ClientsCount() + klog.V(4).InfoS("duplicate server", "serverID", dse.ServerID, "serverCount", cs.serverCount, "clientsCount", clientsCount) + if cs.serverCount != 0 && clientsCount >= cs.serverCount { duration = backoff.Step() + } else { + backoff = cs.resetBackoff() + duration = wait.Jitter(backoff.Duration, backoff.Jitter) } } else { klog.ErrorS(err, "cannot connect once")