github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130924 from serathius/watchcache-delegate-precedense

Browse Source 
Change precedence order for continue and legacy exact match
This commit is contained in:
Kubernetes Prow Robot 2025-03-19 10:19:30 -07:00 committed by GitHub
commit 593906d607
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apiserver/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
staging/src/k8s.io/apiserver/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()