MINOR: Migrate EligibleLeaderReplicasIntegrationTestto use new test infra #20199
+100
−138
Conversation
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
github-actions
bot
added
triage
…ScalaBuffer with CollectionConverters.asScala
…ibleLeaderReplicasIntegrationTest
…ibleLeaderReplicasIntegrationTest
…ibleLeaderReplicasIntegrationTest
…import-control-server.xml, and fix the bug in restartDeadBrokers
chia7712
reviewed
Jul 24, 2025
There was a problem hiding this comment.
@jim0987795064 thanks for this patch. a couple of comments remain. PTAL
checkstyle/import-control-server.xml
Outdated
|
|
||
| <!-- no one depends on the server --> | ||
| <disallow pkg="kafka" /> | ||
| <allow pkg="scala" /> |
There was a problem hiding this comment.
Please use var to avoid importing those dependencies explicitly
| killBroker(initialReplicas.get(0).id()); | ||
| killBroker(initialReplicas.get(1).id()); | ||
| clusterInstance.shutdownBroker(initialReplicas.get(0).id()); | ||
| clusterInstance.shutdownBroker(initialReplicas.get(1).id()); | ||
|
|
||
| waitForIsrAndElr((isrSize, elrSize) -> { |
There was a problem hiding this comment.
waitForIsrAndElr((isrSize, elrSize) -> isrSize == 0 && elrSize == 3);
| return b.config().brokerId() == brokerToBeUncleanShutdown; | ||
| }).get(); | ||
| KafkaBroker broker = clusterInstance.brokers().values().stream().filter(b -> b.config().brokerId() == brokerToBeUncleanShutdown) | ||
| .findFirst().get(); | ||
| Seq<File> dirs = broker.logManager().liveLogDirs(); | ||
| assertEquals(1, dirs.size()); | ||
| CleanShutdownFileHandler handler = new CleanShutdownFileHandler(dirs.apply(0).toString()); | ||
| assertTrue(handler.exists()); | ||
| assertDoesNotThrow(() -> handler.delete()); |
There was a problem hiding this comment.
assertDoesNotThrow(handler::delete);
| throw new IllegalArgumentException("Must supply at least one server config."); | ||
| } | ||
| brokers().entrySet().forEach(entry -> { | ||
| if (!entry.getValue().isShutdown()) { |
There was a problem hiding this comment.
it seems the method is used to restart "dead" brokers, so the condition should be if (entry.getValue().isShutdown()), right?
There was a problem hiding this comment.
Thanks for the feedback. I've addressed issues mentioned above.
jim0987795064
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes: Use ClusterTest to rewrite EligibleLeaderReplicasIntegrationTest.