mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
Minor clearnup in etcd3 code
This commit is contained in:
parent
4dc418c5ee
commit
d70a9615ec
@ -314,21 +314,21 @@ func (s *store) List(ctx context.Context, key, resourceVersion string, pred stor
|
|||||||
|
|
||||||
// Watch implements storage.Interface.Watch.
|
// Watch implements storage.Interface.Watch.
|
||||||
func (s *store) Watch(ctx context.Context, key string, resourceVersion string, pred storage.SelectionPredicate) (watch.Interface, error) {
|
func (s *store) Watch(ctx context.Context, key string, resourceVersion string, pred storage.SelectionPredicate) (watch.Interface, error) {
|
||||||
return s.watch(ctx, key, resourceVersion, storage.SimpleFilter(pred), false)
|
return s.watch(ctx, key, resourceVersion, pred, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
// WatchList implements storage.Interface.WatchList.
|
// WatchList implements storage.Interface.WatchList.
|
||||||
func (s *store) WatchList(ctx context.Context, key string, resourceVersion string, pred storage.SelectionPredicate) (watch.Interface, error) {
|
func (s *store) WatchList(ctx context.Context, key string, resourceVersion string, pred storage.SelectionPredicate) (watch.Interface, error) {
|
||||||
return s.watch(ctx, key, resourceVersion, storage.SimpleFilter(pred), true)
|
return s.watch(ctx, key, resourceVersion, pred, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *store) watch(ctx context.Context, key string, rv string, filter storage.FilterFunc, recursive bool) (watch.Interface, error) {
|
func (s *store) watch(ctx context.Context, key string, rv string, pred storage.SelectionPredicate, recursive bool) (watch.Interface, error) {
|
||||||
rev, err := storage.ParseWatchResourceVersion(rv)
|
rev, err := storage.ParseWatchResourceVersion(rv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
key = keyWithPrefix(s.pathPrefix, key)
|
key = keyWithPrefix(s.pathPrefix, key)
|
||||||
return s.watcher.Watch(ctx, key, int64(rev), recursive, filter)
|
return s.watcher.Watch(ctx, key, int64(rev), recursive, storage.SimpleFilter(pred))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *store) getState(getResp *clientv3.GetResponse, key string, v reflect.Value, ignoreNotFound bool) (*objState, error) {
|
func (s *store) getState(getResp *clientv3.GetResponse, key string, v reflect.Value, ignoreNotFound bool) (*objState, error) {
|
||||||
|
@ -92,7 +92,7 @@ func testWatch(t *testing.T, recursive bool) {
|
|||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
for i, tt := range tests {
|
for i, tt := range tests {
|
||||||
w, err := store.watch(ctx, tt.key, "0", storage.SimpleFilter(tt.pred), recursive)
|
w, err := store.watch(ctx, tt.key, "0", tt.pred, recursive)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Watch failed: %v", err)
|
t.Fatalf("Watch failed: %v", err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user