Skip to content

Commit db2cd97

Browse files
committed
changed KNP agent clientset to pick up the larger of the two server counts
1 parent 23b100b commit db2cd97

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

pkg/agent/clientset.go

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,15 +218,25 @@ func (cs *ClientSet) sync() {
218218
}
219219

220220
func (cs *ClientSet) ServerCount() int {
221-
var serverCount int
221+
countFromLeases := 0
222222
if cs.leaseCounter != nil {
223-
serverCount = cs.leaseCounter.Count()
224-
} else {
225-
serverCount = cs.lastReceivedServerCount
223+
countFromLeases = cs.leaseCounter.Count()
224+
}
225+
countFromResponses := cs.lastReceivedServerCount
226+
227+
serverCount := countFromLeases
228+
countSource := "KNP server lease count"
229+
if countFromResponses > serverCount {
230+
serverCount = countFromResponses
231+
countSource = "KNP server response headers"
232+
}
233+
if serverCount == 0 {
234+
serverCount = 1
235+
countSource = "fallback to 1"
226236
}
227237

228238
if serverCount != cs.lastServerCount {
229-
klog.Warningf("change detected in proxy server count (was: %d, now: %d)", cs.lastServerCount, serverCount)
239+
klog.Warningf("change detected in proxy server count (was: %d, now: %d, source: %q)", cs.lastServerCount, serverCount, countSource)
230240
cs.lastServerCount = serverCount
231241
}
232242

0 commit comments

Comments
 (0)