This is an automated email from the ASF dual-hosted git repository.
showuon pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new cf5d63e7dc4 Revert "KAFKA-20617: add validation for cluster-id in
Formatter (#22384)" (#22539)
cf5d63e7dc4 is described below
commit cf5d63e7dc419736713370cf4a67384dc32be6cf
Author: Gaurav Narula <[email protected]>
AuthorDate: Fri Jun 12 10:44:57 2026 +0100
Revert "KAFKA-20617: add validation for cluster-id in Formatter (#22384)"
(#22539)
This reverts commit 6944bce421d818e791dcca0a4806aeade1147ca9.
As discussed in #22384, the change is not compatible for existing users
as KIP-78 never mandated the use of Uuid for cluster id.
The validation will be taken up in a future KIP.
Reviewers: Chia-Ping Tsai <[email protected]>
---
.../apache/kafka/metadata/storage/Formatter.java | 27 +++-------------------
.../kafka/metadata/storage/FormatterTest.java | 24 -------------------
.../ReconfigurableQuorumIntegrationTest.java | 12 +++++-----
3 files changed, 9 insertions(+), 54 deletions(-)
diff --git
a/metadata/src/main/java/org/apache/kafka/metadata/storage/Formatter.java
b/metadata/src/main/java/org/apache/kafka/metadata/storage/Formatter.java
index 2d07e4d7a0e..0cda5275f8b 100644
--- a/metadata/src/main/java/org/apache/kafka/metadata/storage/Formatter.java
+++ b/metadata/src/main/java/org/apache/kafka/metadata/storage/Formatter.java
@@ -243,34 +243,13 @@ public class Formatter {
return bootstrapMetadata;
}
- /**
- * Validates the correctness of the given cluster id. A valid cluster id
is a base64, urlencoded, no padding
- * representation of a {@link Uuid}. These checks do not validate the
absence of <code>-</code> character as
- * {@link Uuid#randomUuid()} avoids them only for convenience reasons and
such a validation would break
- * compatibility when attempting to format using an old cluster id.
- */
- private void validateClusterId(String clusterId) {
- if (clusterId == null) {
- throw new FormatterException("You must specify the cluster id.");
- }
- if (clusterId.contains("=")) {
- throw new FormatterException("The specified cluster id, " +
clusterId + " is invalid: contains padding");
- }
- try {
- Uuid uuid = Uuid.fromString(clusterId);
- if (Uuid.RESERVED.contains(uuid)) {
- throw new FormatterException("The specified cluster id, " +
clusterId + " is reserved");
- }
- } catch (IllegalArgumentException e) {
- throw new FormatterException("The specified cluster id, " +
clusterId + " is invalid", e);
- }
- }
-
public void run() throws Exception {
if (nodeId < 0) {
throw new RuntimeException("You must specify a valid non-negative
node ID.");
}
- validateClusterId(clusterId);
+ if (clusterId == null) {
+ throw new FormatterException("You must specify the cluster id.");
+ }
if (directories.isEmpty()) {
throw new FormatterException("You must specify at least one
directory to format");
}
diff --git
a/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java
b/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java
index 3ae705a4b01..fa2125eb40b 100644
---
a/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java
+++
b/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java
@@ -608,28 +608,4 @@ public class FormatterTest {
assertNotNull(logDirProps1);
}
}
-
- @ParameterizedTest
- @ValueSource(strings = {"unrvTtQISjar0JUWGU/8Pg",
"igNUVIdeSPO5JCZYFhOh7Q==", "AAAAAAAAAAAAAAAAAAAAAA", "AAAAAAAAAAAAAAAAAAAAAQ"})
- public void testFormatWithInvalidClusterId(String clusterId) throws
Exception {
- try (TestEnv testEnv = new TestEnv(2)) {
- FormatterContext formatter1 = testEnv.newFormatter();
- formatter1.formatter.setClusterId(clusterId);
- String expectedPrefix = "The specified cluster id, " + clusterId;
- assertEquals(expectedPrefix,
- assertThrows(FormatterException.class,
- formatter1.formatter::run).
- getMessage().substring(0,
expectedPrefix.length()));
- }
- }
-
- @ParameterizedTest
- @ValueSource(strings = {"iIygKoNNSpGzNeAEr_QW7w",
"-w_KF-snTmuEnKPqZ0RDzA", "dZMgZA7nTLqZTdzb0zbvSQ", "hxqHyN2OSSmPajVhm_DR-Q"})
- public void testFormatWithValidClusterId(String clusterId) throws
Exception {
- try (TestEnv testEnv = new TestEnv(2)) {
- FormatterContext formatter1 = testEnv.newFormatter();
- formatter1.formatter.setClusterId(clusterId);
- formatter1.formatter.run();
- }
- }
}
diff --git
a/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java
b/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java
index a9a10180695..f89ce62c3d8 100644
---
a/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java
+++
b/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java
@@ -255,7 +255,7 @@ public class ReconfigurableQuorumIntegrationTest {
@Test
public void testRemoveAndAddVoterWithValidClusterId() throws Exception {
final var nodes = new TestKitNodes.Builder()
- .setClusterId("5EqhrOPYSkaSsXk4RYkNow")
+ .setClusterId("test-cluster")
.setNumBrokerNodes(1)
.setNumControllerNodes(3)
.build();
@@ -285,7 +285,7 @@ public class ReconfigurableQuorumIntegrationTest {
admin.removeRaftVoter(
3000,
dirId,
- new
RemoveRaftVoterOptions().setClusterId(Optional.of("5EqhrOPYSkaSsXk4RYkNow"))
+ new
RemoveRaftVoterOptions().setClusterId(Optional.of("test-cluster"))
).all().get();
retryOnExceptionWithTimeout(30_000, 10, () -> {
Map<Integer, Uuid> voters = findVoterDirs(admin);
@@ -297,7 +297,7 @@ public class ReconfigurableQuorumIntegrationTest {
retryOnExceptionWithTimeout(30_000, 1_000, () ->
admin.addRaftVoter(3000, dirId, Set.of(new
RaftVoterEndpoint("CONTROLLER", "localhost", port)),
- new
AddRaftVoterOptions().setClusterId(Optional.of("5EqhrOPYSkaSsXk4RYkNow"))).all().get());
+ new
AddRaftVoterOptions().setClusterId(Optional.of("test-cluster"))).all().get());
}
}
}
@@ -305,7 +305,7 @@ public class ReconfigurableQuorumIntegrationTest {
@Test
public void testRemoveAndAddVoterWithInconsistentClusterId() throws
Exception {
final var nodes = new TestKitNodes.Builder()
- .setClusterId("5EqhrOPYSkaSsXk4RYkNow")
+ .setClusterId("test-cluster")
.setNumBrokerNodes(1)
.setNumControllerNodes(3)
.build();
@@ -326,7 +326,7 @@ public class ReconfigurableQuorumIntegrationTest {
var removeFuture = admin.removeRaftVoter(
3000,
dirId,
- new
RemoveRaftVoterOptions().setClusterId(Optional.of("wXyMD5v8SeGIHHxZEdmSLA"))
+ new
RemoveRaftVoterOptions().setClusterId(Optional.of("inconsistent"))
).all();
assertFutureThrows(InconsistentClusterIdException.class,
removeFuture);
@@ -334,7 +334,7 @@ public class ReconfigurableQuorumIntegrationTest {
3000,
dirId,
Set.of(new RaftVoterEndpoint("CONTROLLER", "localhost",
port(admin, 3000))),
- new
AddRaftVoterOptions().setClusterId(Optional.of("wXyMD5v8SeGIHHxZEdmSLA"))
+ new
AddRaftVoterOptions().setClusterId(Optional.of("inconsistent"))
).all();
assertFutureThrows(InconsistentClusterIdException.class,
addFuture);
}
