KAFKA-16712: Fix race in TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest#15962
Merged
chia7712 merged 3 commits intoapache:trunkfrom May 16, 2024
Merged
KAFKA-16712: Fix race in TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest#15962chia7712 merged 3 commits intoapache:trunkfrom
chia7712 merged 3 commits intoapache:trunkfrom
Conversation
…bscriptionsTest `TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest` has a race when it sets the `RemoteLogMetadataTopicPartitioner` using the setter. This change fixes the race condition by passing the `RemoteLogMetadataTopicPartitioner` instance in a `Function<Integer, RemoteLogMetaedataTopicPartitioner>` which is used in `configure()` in `TopicBasedRemoteLogMetadataManager`. It also improves the waitingFor condition by spying on `RemotePartitionMetadataStore` and awaiting on Phasers to ensure ConsumerManager makes progress before performing assertions.
Contributor
Author
|
CC: @kamalcph this is following the discussion at #15885 (comment) |
kamalcph
reviewed
May 15, 2024
Contributor
kamalcph
left a comment
kamalcph
left a comment
There was a problem hiding this comment.
LGTM. Thanks for the patch!
This is the first time, Phaser is being used in the project. And, it is not straight-forward to understand. Could you please add more comments?
chia7712
reviewed
May 15, 2024
|
|
||
| topicBasedRemoteLogMetadataManager.configure(configs); | ||
| if (remoteLogMetadataTopicPartitioner != null) { | ||
| topicBasedRemoteLogMetadataManager.setRlmTopicPartitioner(remoteLogMetadataTopicPartitioner); |
Member
There was a problem hiding this comment.
setRlmTopicPartitioner gets unused now, so could you please remove it?
| Phaser initializationPhaser = new Phaser(2); // 1 to register test thread, 1 to register leaderTopicIdPartition | ||
| doAnswer(invocationOnMock -> { | ||
| Object result = invocationOnMock.callRealMethod(); | ||
| initializationPhaser.arriveAndDeregister(); |
Member
There was a problem hiding this comment.
Maybe we can use CountDownLatch instead? And we can override the stub (i.e create doAnswer again) before running onPartitionLeadershipChanges? For example:
CountDownLatch latch = new CountDownLatch(1);
doAnswer(invocationOnMock -> {
Object result = invocationOnMock.callRealMethod();
latch.countDown();
return result;
}).when(spyRemotePartitionMetadataStore).markInitialized(any());
...
latch.await(30_000, TimeUnit.MILLISECONDS);
...
CountDownLatch latch2 = new CountDownLatch(1);
doAnswer(invocationOnMock -> {
Object result = invocationOnMock.callRealMethod();
latch2.countDown();
return result;
}).when(spyRemotePartitionMetadataStore).markInitialized(any());
...
rlmm().onPartitionLeadershipChanges(Collections.singleton(emptyTopicIdPartition),
Collections.singleton(followerTopicIdPartition));
Contributor
Author
There was a problem hiding this comment.
I've added some comments in 9cfda4f to describe the Phaser operations following Kamal's suggestion.
Please let me know if that's okay. I'd prefer not duplicating the stub given a data structure in the standard library fits the purpose but I'm happy to change it if you feel it's confusing for future readers.
kamalcph
approved these changes
May 15, 2024
chia7712
approved these changes
May 15, 2024
Member
chia7712
left a comment
chia7712
left a comment
There was a problem hiding this comment.
+1 will merge it if no related failed tests
3 tasks
rreddy-22
pushed a commit
to rreddy-22/kafka-rreddy
that referenced
this pull request
May 24, 2024
…scriptionsTest (apache#15962) TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest has a race when it sets RemoteLogMetadataTopicPartitioner using the setter. This change fixes the race condition by passing the RemoteLogMetadataTopicPartitioner instance in a Function<Integer, RemoteLogMetaedataTopicPartitioner> which is used in configure() in TopicBasedRemoteLogMetadataManager. It also improves the waitingFor condition by spying on RemotePartitionMetadataStore and awaiting on Phasers to ensure ConsumerManager makes progress before performing assertions. Reviewers: Kamal Chandraprakash <kamal.chandraprakash@gmail.com>, Chia-Ping Tsai <chia7712@gmail.com>
TaiJuWu
pushed a commit
to TaiJuWu/kafka
that referenced
this pull request
Jun 8, 2024
…scriptionsTest (apache#15962) TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest has a race when it sets RemoteLogMetadataTopicPartitioner using the setter. This change fixes the race condition by passing the RemoteLogMetadataTopicPartitioner instance in a Function<Integer, RemoteLogMetaedataTopicPartitioner> which is used in configure() in TopicBasedRemoteLogMetadataManager. It also improves the waitingFor condition by spying on RemotePartitionMetadataStore and awaiting on Phasers to ensure ConsumerManager makes progress before performing assertions. Reviewers: Kamal Chandraprakash <kamal.chandraprakash@gmail.com>, Chia-Ping Tsai <chia7712@gmail.com>
gongxuanzhang
pushed a commit
to gongxuanzhang/kafka
that referenced
this pull request
Jun 12, 2024
…scriptionsTest (apache#15962) TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest has a race when it sets RemoteLogMetadataTopicPartitioner using the setter. This change fixes the race condition by passing the RemoteLogMetadataTopicPartitioner instance in a Function<Integer, RemoteLogMetaedataTopicPartitioner> which is used in configure() in TopicBasedRemoteLogMetadataManager. It also improves the waitingFor condition by spying on RemotePartitionMetadataStore and awaiting on Phasers to ensure ConsumerManager makes progress before performing assertions. Reviewers: Kamal Chandraprakash <kamal.chandraprakash@gmail.com>, Chia-Ping Tsai <chia7712@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTesthas a race when it setsRemoteLogMetadataTopicPartitionerusing the setter.This change fixes the race condition by passing the
RemoteLogMetadataTopicPartitionerinstance in aFunction<Integer, RemoteLogMetaedataTopicPartitioner>which is used inconfigure()inTopicBasedRemoteLogMetadataManager.It also improves the waitingFor condition by spying on
RemotePartitionMetadataStoreand awaiting on Phasers to ensure ConsumerManager makes progress before performing assertions.Committer Checklist (excluded from commit message)