Skip to content

Bug 1948311: UPSTREAM: 102606: Bring back "client-go: add retry logic for Watch and Stream" and fix test flake #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Jun 9, 2021
Merged

Bug 1948311: UPSTREAM: 102606: Bring back "client-go: add retry logic for Watch and Stream" and fix test flake #792

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c66f9bc
UPSTREAM: 102581: Revert "client-go: add retry logic for Watch and St…
tkashem Jun 8, 2021
e9c638a
UPSTREAM: 102606: Bring back "client-go: add retry logic for Watch an…
tkashem Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions staging/src/k8s.io/client-go/rest/request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2773,7 +2773,16 @@ func TestRequestStreamWithRetry(t *testing.T) {

func TestRequestWatchWithRetry(t *testing.T) {
testRequestWithRetry(t, "Watch", func(ctx context.Context, r *Request) {
r.Watch(ctx)
w, err := r.Watch(ctx)
if err == nil {
// in this test the the response body returned by the server is always empty,
// this will cause StreamWatcher.receive() to:
// - return an io.EOF to indicate that the watch closed normally and
// - then close the io.Reader
// since we assert on the number of times 'Close' has been called on the
// body of the response object, we need to wait here to avoid race condition.
<-w.ResultChan()
}
})
}

Expand Down Expand Up @@ -2870,8 +2879,9 @@ func testRequestWithRetry(t *testing.T, key string, doFunc func(ctx context.Cont
"Watch": {
attempts: 3,
reqCount: &count{closes: 0, seeks: make([]seek, 2)},
// we don't close the the Body of the final successful response
respCount: &count{closes: 1, seeks: []seek{}},
// the Body of the successful response object will get closed by
// StreamWatcher, so we need to take that into account.
respCount: &count{closes: 2, seeks: []seek{}},
},
"Stream": {
attempts: 2,
Expand Down