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

Fix incorrect error message in watch.Until

Browse Source
This commit is contained in:
Janet Kuo 2017-02-07 16:51:35 -08:00
parent 4cef1008f4
commit 51c7570ae1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go
View File

@ -129,6 +129,9 @@ func Jitter(duration time.Duration, maxFactor float64) time.Duration {
// ErrWaitTimeout is returned when the condition exited without success. // ErrWaitTimeout is returned when the condition exited without success.
var ErrWaitTimeout = errors.New("timed out waiting for the condition") var ErrWaitTimeout = errors.New("timed out waiting for the condition")
// ErrChannelClosed is returned when the watch channel is closed.
var ErrChannelClosed = errors.New("watch channel closed")
// ConditionFunc returns true if the condition is satisfied, or an error // ConditionFunc returns true if the condition is satisfied, or an error
// if the loop should be aborted. // if the loop should be aborted.
type ConditionFunc func() (done bool, err error) type ConditionFunc func() (done bool, err error)

2
staging/src/k8s.io/apimachinery/pkg/watch/until.go
View File

@ -61,7 +61,7 @@ func Until(timeout time.Duration, watcher Interface, conditions ...ConditionFunc
select { select {
case event, ok := <-ch: case event, ok := <-ch:
if !ok { if !ok {
return lastEvent, wait.ErrWaitTimeout return lastEvent, wait.ErrChannelClosed
} }
lastEvent = &event lastEvent = &event