Skip to content
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

Jump to bottom

test(pubsublite): fix flaky TestAssigningSubscriberAddRemovePartitions #4564

Merged
merged 2 commits into from Sep 1, 2021
Merged

test(pubsublite): fix flaky TestAssigningSubscriberAddRemovePartitions #4564

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b52965
test(pubsublite): fix flaky TestAssigningSubscriberAddRemovePartitions
tmdiep Aug 6, 2021
c908e1a
Merge branch 'master' into flaky_assigning_subs
tmdiep Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions pubsublite/internal/wire/subscriber_test.go
View file
Open in desktop
Expand Up @@ -1135,8 +1135,8 @@ func TestAssigningSubscriberAddRemovePartitions(t *testing.T) {
// Assignment stream
asnStream := test.NewRPCVerifier(t)
asnStream.Push(initAssignmentReq(subscription, fakeUUID[:]), assignmentResp([]int64{3, 6}), nil)
assignmentBarrier := asnStream.PushWithBarrier(assignmentAckReq(), assignmentResp([]int64{3, 8}), nil)
asnStream.Push(assignmentAckReq(), nil, nil)
assignmentBarrier1 := asnStream.PushWithBarrier(assignmentAckReq(), assignmentResp([]int64{3, 8}), nil)
assignmentBarrier2 := asnStream.PushWithBarrier(assignmentAckReq(), nil, nil)
verifiers.AddAssignmentStream(subscription, asnStream)

// Partition 3
Expand Down Expand Up @@ -1191,7 +1191,7 @@ func TestAssigningSubscriberAddRemovePartitions(t *testing.T) {
}

// Partition assignments will now be {3, 8}.
assignmentBarrier.Release()
assignmentBarrier1.Release()
receiver.ValidateMsgs(partitionMsgs(8, msg5))
if got, want := sub.Partitions(), []int{3, 8}; !testutil.Equal(got, want) {
t.Errorf("subscriber partitions: got %d, want %d", got, want)
Expand All @@ -1204,6 +1204,10 @@ func TestAssigningSubscriberAddRemovePartitions(t *testing.T) {
msg4Barrier.Release()
receiver.ValidateMsgs(partitionMsgs(3, msg2))

// Ensure the second assignment ack is received by the server to avoid test
// flakiness.
assignmentBarrier2.Release()

// Stop should flush all commit cursors.
sub.Stop()
if gotErr := sub.WaitStopped(); gotErr != nil {
Expand Down