Skip to content

test/xds: fail only when state changes to something other than READY and IDLE #5463

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
easwars merged 2 commits into from
Jun 24, 2022
Merged

test/xds: fail only when state changes to something other than READY and IDLE #5463

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d6a507
test/xds: fail only when state changes to something other than READY …
easwars Jun 23, 2022
74f12d9
track state change with prev and curr
easwars Jun 23, 2022
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
15 changes: 12 additions & 3 deletions test/xds/xds_server_serving_mode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,18 @@ func (s) TestServerSideXDS_RedundantUpdateSuppression(t *testing.T) {
// suppressed, server will recycle client connections.
errCh := make(chan error, 1)
go func() {
if cc.WaitForStateChange(ctx, connectivity.Ready) {
errCh <- fmt.Errorf("unexpected connectivity state change {%s --> %s} on the client connection", connectivity.Ready, cc.GetState())
return
prev := connectivity.Ready // We know we are READY since we just did an RPC.
for {
curr := cc.GetState()
Copy link
Copy Markdown
Contributor

@zasweq zasweq Jun 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qq: what happens if the context gets cancelled when you are here. Will the WaitForStateChange call later still return false? It reads the ctx.Done() channel which has already been closed, will this Done channel still send a zero value that signifies it's been closed?

Copy link
Copy Markdown
Contributor

@zasweq zasweq Jun 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Successive calls to Done return the same value."

"A receive operation on a closed channel can always proceed immediately, yielding the element type's zero value after any previously sent values have been received."

I think these statements from godoc mean the answer to my question is yes, but just making sure.

if !(curr == connectivity.Ready || curr == connectivity.Idle) {
errCh <- fmt.Errorf("unexpected connectivity state change {%s --> %s} on the client connection", prev, curr)
return
}
if !cc.WaitForStateChange(ctx, curr) {
// Break out of the for loop when the context has been cancelled.
Copy link
Copy Markdown
Contributor

@zasweq zasweq Jun 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: is this comment needed?

break
}
prev = curr
}
errCh <- nil
}()
Expand Down