kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change precedence order for continue and legacy exact match 

This doesn't matter for shouldDelegateList, but matters when picking
source of RV. RV from continue takes precedence.

Kubernetes-commit: 7da942ca7486310893d4f11f3af062957f953555
This commit is contained in:
Marek Siarkowicz 2025-03-19 13:58:43 +01:00 committed by Kubernetes Publisher
parent dfc7cb5fe1
commit 91724cfd41
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/storage/cacher/delegator.go
View File

@ -257,14 +257,14 @@ func shouldDelegateList(opts storage.ListOptions, cache delegator.Helper) (deleg
case metav1.ResourceVersionMatchNotOlderThan: case metav1.ResourceVersionMatchNotOlderThan:
return delegator.Result{ShouldDelegate: false}, nil return delegator.Result{ShouldDelegate: false}, nil
case "": case "":
// Legacy exact match
if opts.Predicate.Limit > 0 && len(opts.ResourceVersion) > 0 && opts.ResourceVersion != "0" {
return cache.ShouldDelegateExactRV(opts.ResourceVersion, opts.Recursive)
}
// Continue // Continue
if len(opts.Predicate.Continue) > 0 { if len(opts.Predicate.Continue) > 0 {
return cache.ShouldDelegateContinue(opts.Predicate.Continue, opts.Recursive) return cache.ShouldDelegateContinue(opts.Predicate.Continue, opts.Recursive)
} }
// Legacy exact match
if opts.Predicate.Limit > 0 && len(opts.ResourceVersion) > 0 && opts.ResourceVersion != "0" {
return cache.ShouldDelegateExactRV(opts.ResourceVersion, opts.Recursive)
}
// Consistent Read // Consistent Read
if opts.ResourceVersion == "" { if opts.ResourceVersion == "" {
return cache.ShouldDelegateConsistentRead() return cache.ShouldDelegateConsistentRead()

8
pkg/util/flowcontrol/request/list_work_estimator.go
View File

@ -172,14 +172,14 @@ func shouldDelegateList(opts *metav1.ListOptions, cache delegator.Helper) (deleg
case metav1.ResourceVersionMatchNotOlderThan: case metav1.ResourceVersionMatchNotOlderThan:
return delegator.Result{ShouldDelegate: false}, nil return delegator.Result{ShouldDelegate: false}, nil
case "": case "":
// Legacy exact match
if opts.Limit > 0 && len(opts.ResourceVersion) > 0 && opts.ResourceVersion != "0" {
return cache.ShouldDelegateExactRV(opts.ResourceVersion, defaultRecursive)
}
// Continue // Continue
if len(opts.Continue) > 0 { if len(opts.Continue) > 0 {
return cache.ShouldDelegateContinue(opts.Continue, defaultRecursive) return cache.ShouldDelegateContinue(opts.Continue, defaultRecursive)
} }
// Legacy exact match
if opts.Limit > 0 && len(opts.ResourceVersion) > 0 && opts.ResourceVersion != "0" {
return cache.ShouldDelegateExactRV(opts.ResourceVersion, defaultRecursive)
}
// Consistent Read // Consistent Read
if opts.ResourceVersion == "" { if opts.ResourceVersion == "" {
return cache.ShouldDelegateConsistentRead() return cache.ShouldDelegateConsistentRead()