fix: avoid stale server count update

ipochi · ipochi · commit c263456eb035 · 2025-09-11T19:21:47.000Z
Signed-off-by: Imran Pochi &lt;imranpochi@microsoft.com&gt;
diff --git a/pkg/agent/clientset.go b/pkg/agent/clientset.go
@@ -214,11 +214,14 @@ func (cs *ClientSet) connectOnce() error {
 			"current", cs.serverCount, "serverID", c.serverID, "actual", serverCount)
 
 	}
-	cs.serverCount = serverCount
 	if err := cs.AddClient(c.serverID, c); err != nil {
 		c.Close()
 		return err
 	}
+	// By moving the update to here, we only accept the server count from a server
+	// that we have successfully added to our active client set, implicitly ignoring
+	// stale data from duplicate connection attempts.
+	cs.serverCount = serverCount
 	klog.V(2).InfoS("sync added client connecting to proxy server", "serverID", c.serverID)
 
 	labels := runpprof.Labels(

Original file line number	Diff line number	Diff line change
`@@ -214,11 +214,14 @@ func (cs *ClientSet) connectOnce() error {`
`214`	`214`	`"current", cs.serverCount, "serverID", c.serverID, "actual", serverCount)`
`215`	`215`
`216`	`216`	`}`
`217`		`- cs.serverCount = serverCount`
`218`	`217`	`if err := cs.AddClient(c.serverID, c); err != nil {`
`219`	`218`	`c.Close()`
`220`	`219`	`return err`
`221`	`220`	`}`
	`221`	`+ // By moving the update to here, we only accept the server count from a server`
	`222`	`+ // that we have successfully added to our active client set, implicitly ignoring`
	`223`	`+ // stale data from duplicate connection attempts.`
	`224`	`+ cs.serverCount = serverCount`
`222`	`225`	`klog.V(2).InfoS("sync added client connecting to proxy server", "serverID", c.serverID)`
`223`	`226`
`224`	`227`	`labels := runpprof.Labels(`