Merge pull request kubernetes#85257 from yutedz/queueset-robin-idx

k8s-ci-robot · web-flow · commit 8dffc8db4fbb · 2019-11-14T16:38:50.000-08:00
Correct the checking of robinIndex
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go
@@ -568,7 +568,7 @@ func (qs *queueSet) finishRequestLocked(r *request) {
 
 		// decrement here to maintain the invariant that (qs.robinIndex+1) % numQueues
 		// is the index of the next queue after the one last dispatched from
-		if qs.robinIndex >= -r.Queue.Index {
+		if qs.robinIndex >= r.Queue.Index {
 			qs.robinIndex--
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ func (qs queueSet) finishRequestLocked(r request) {`
`568`	`568`
`569`	`569`	`// decrement here to maintain the invariant that (qs.robinIndex+1) % numQueues`
`570`	`570`	`// is the index of the next queue after the one last dispatched from`
`571`		`- if qs.robinIndex >= -r.Queue.Index {`
	`571`	`+ if qs.robinIndex >= r.Queue.Index {`
`572`	`572`	`qs.robinIndex--`
`573`	`573`	`}`
`574`	`574`