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

Refactor WaitUntilFreshAndList to split out filtering to separate function 

Kubernetes-commit: 7400d57943cf7576925d54e7daa42e397e71dfe4
This commit is contained in:
Marek Siarkowicz 2024-08-28 12:59:38 +02:00 committed by Kubernetes Publisher
parent 784a83e3b4
commit 94a5e3cd04
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/storage/cacher/watch_cache.go
View File

@ -506,19 +506,10 @@ func (w *watchCache) WaitUntilFreshAndList(ctx context.Context, resourceVersion
if err != nil {
return nil, 0, "", err
}
var result []interface{}
for _, item := range items {
elem, ok := item.(*storeElement)
if !ok {
return nil, 0, "", fmt.Errorf("non *storeElement returned from storage: %v", item)
}
if !hasPathPrefix(elem.Key, key) {
continue
}
result = append(result, item)
result, err := filterPrefix(key, items)
if err != nil {
return nil, 0, "", err
}
sort.Sort(sortableStoreElements(result))
return result, rv, index, nil
}
@ -554,6 +545,21 @@ func (w *watchCache) waitUntilFreshAndListItems(ctx context.Context, resourceVer
return result, rv, index, err
}
func filterPrefix(prefix string, items []interface{}) ([]interface{}, error) {
var result []interface{}
for _, item := range items {
elem, ok := item.(*storeElement)
if !ok {
return nil, fmt.Errorf("non *storeElement returned from storage: %v", item)
}
if !hasPathPrefix(elem.Key, prefix) {
continue
}
result = append(result, item)
}
return result, nil
}
func (w *watchCache) notFresh(resourceVersion uint64) bool {
w.RLock()
defer w.RUnlock()