Skip to content

KAFKA-19592: testGenerateAssignmentWithBootstrapServer uses wrong JSON format #20336

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
FrankYang0529 merged 7 commits into from
Aug 11, 2025
Merged

KAFKA-19592: testGenerateAssignmentWithBootstrapServer uses wrong JSON format #20336

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
233b2c2
init commit
TaiJuWu Aug 11, 2025
8709a26
fix PartitionReassignmentState.toString
TaiJuWu Aug 11, 2025
6e181b6
make record
TaiJuWu Aug 11, 2025
240ce9c
revert
TaiJuWu Aug 11, 2025
18116c5
remove public identify
TaiJuWu Aug 11, 2025
727efd9
address comments
TaiJuWu Aug 11, 2025
afe5c66
address comments
TaiJuWu Aug 11, 2025
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
7 changes: 7 additions & 0 deletions tools/src/main/java/org/apache/kafka/tools/reassign/PartitionReassignmentState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,11 @@ public boolean equals(Object o) {
public int hashCode() {
return Objects.hash(currentReplicas, targetReplicas, done);
}

@Override
public String toString() {
return "currentReplicas=" + currentReplicas + ", "
+ "targetReplicas=" + targetReplicas + ", "
+ "done=" + done;
}
}
8 changes: 8 additions & 0 deletions tools/src/main/java/org/apache/kafka/tools/reassign/VerifyAssignmentResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,12 @@ public boolean equals(Object o) {
public int hashCode() {
return Objects.hash(partStates, partsOngoing, moveStates, movesOngoing);
}

@Override
public String toString() {
return "partStates=" + partStates + ", "
+ "partsOngoing=" + partsOngoing + ", "
+ "moveStates=" + moveStates + ", "
+ "movesOngoing=" + movesOngoing;
}
}
17 changes: 11 additions & 6 deletions tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,18 @@ public void testGenerateAssignmentWithBootstrapServer() throws Exception {
produceMessages(foo0.topic(), foo0.partition(), 100);

try (Admin admin = Admin.create(Map.of(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, clusterInstance.bootstrapServers()))) {
String assignment = "{\"version\":1,\"partitions\":" +
"[{\"topic\":\"foo\",\"partition\":0,\"replicas\":[3,1,2],\"log_dirs\":[\"any\",\"any\",\"any\"]}" +
"]}";
generateAssignment(admin, assignment, "1,2,3", false);
String topicsToMoveJson = "{\"topics\":\n\t[{\"topic\": \"foo\"}],\n\"version\":1\n}";
var assignment = generateAssignment(admin, topicsToMoveJson, "1,2,3", false);
Map<TopicPartition, List<Integer>> proposedAssignments = assignment.getKey();
String assignmentJson = String.format("{\"version\":1,\"partitions\":" +
"[{\"topic\":\"foo\",\"partition\":0,\"replicas\":%s,\"log_dirs\":[\"any\",\"any\",\"any\"]}" +
"]}", proposedAssignments.get(foo0));

@frankvicky frankvicky Aug 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's not easy to read. Can we use the text block feature from Java 17?

For example:

            String assignmentJson = String.format("""
                {"version":1,"partitions":\
                [{"topic":"foo","partition":0,"replicas":%s,"log_dirs":["any","any","any"]}\
                ]}""", proposedAssignments.get(foo0));


runExecuteAssignment(false, assignmentJson, -1L, -1L);

Map<TopicPartition, PartitionReassignmentState> finalAssignment = Map.of(foo0,
new PartitionReassignmentState(List.of(0, 1, 2), List.of(3, 1, 2), true));
waitForVerifyAssignment(admin, assignment, false,
new PartitionReassignmentState(proposedAssignments.get(foo0), proposedAssignments.get(foo0), true));
waitForVerifyAssignment(admin, assignmentJson, false,
new VerifyAssignmentResult(finalAssignment));
}
}
Expand Down
Loading