github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-08-10 19:51:55 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade ListWatchUntil

Browse Source 
Kubernetes-commit: 603dd254ac91b3581f9b431ff91a95d929a97e04
This commit is contained in:
Tomas Nozicka 2019-02-18 18:20:23 +01:00 committed by Kubernetes Publisher
parent ce00ab47ae
commit 8ecda4e5ed
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/watch/until.go
View File

@ -168,13 +168,14 @@ func ContextWithOptionalTimeout(parent context.Context, timeout time.Duration) (
return context.WithTimeout(parent, timeout) return context.WithTimeout(parent, timeout)
} }
// ListWatchUntil checks the provided conditions against the items returned by the list watcher, returning wait.ErrWaitTimeout // ListWatchUntil first lists objects, converts them into synthetic ADDED events
// if timeout is exceeded without all conditions returning true, or an error if an error occurs. // and checks conditions for those synthetic events. If the conditions have not been reached so far
// TODO: check for watch expired error and retry watch from latest point? Same issue exists for Until. // it continues by calling Until which establishes a watch from resourceVersion of the list call
// TODO: remove when no longer used // to evaluate those conditions based on new events.
// // ListWatchUntil provides the same guarantees as Until and replaces the old WATCH from RV "" (or "0")
// Deprecated: Use UntilWithSync instead. // which was mixing list and watch calls internally and having severe design issues. (see #74022)
func ListWatchUntil(timeout time.Duration, lw cache.ListerWatcher, conditions ...ConditionFunc) (*watch.Event, error) { // There is no resourceVersion order guarantee for the initial list and those synthetic events.
func ListWatchUntil(ctx context.Context, lw cache.ListerWatcher, conditions ...ConditionFunc) (*watch.Event, error) {
if len(conditions) == 0 { if len(conditions) == 0 {
return nil, nil return nil, nil
} }
@ -231,17 +232,5 @@ func ListWatchUntil(timeout time.Duration, lw cache.ListerWatcher, conditions ..
} }
currResourceVersion := metaObj.GetResourceVersion() currResourceVersion := metaObj.GetResourceVersion()
watchInterface, err := lw.Watch(metav1.ListOptions{ResourceVersion: currResourceVersion}) return Until(ctx, currResourceVersion, lw, remainingConditions...)
if err != nil {
return nil, err
}
ctx, cancel := ContextWithOptionalTimeout(context.Background(), timeout)
defer cancel()
evt, err := UntilWithoutRetry(ctx, watchInterface, remainingConditions...)
if err == ErrWatchClosed {
// present a consistent error interface to callers
err = wait.ErrWaitTimeout
}
return evt, err
} }