This is an automated email from the ASF dual-hosted git repository.
davidarthur 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 db626a48042 KAFKA-15582 Unset the previous broker epoch if version < 2
(#14784)
db626a48042 is described below
commit db626a48042387d49983fc37e66728a7a3343aea
Author: Calvin Liu <[email protected]>
AuthorDate: Tue Nov 28 07:36:59 2023 -0800
KAFKA-15582 Unset the previous broker epoch if version < 2 (#14784)
When using older versions of the broker registration RPC, make sure that
the new PreviousBrokerEpoch field is set to the default value when building the
request object.
Reviewers: David Arthur <[email protected]>
---
.../common/requests/BrokerRegistrationRequest.java | 4 ++
.../requests/BrokerRegistrationRequestTest.java | 62 ++++++++++++++++++++++
2 files changed, 66 insertions(+)
diff --git
a/clients/src/main/java/org/apache/kafka/common/requests/BrokerRegistrationRequest.java
b/clients/src/main/java/org/apache/kafka/common/requests/BrokerRegistrationRequest.java
index 18d6a070d05..9849f187cf4 100644
---
a/clients/src/main/java/org/apache/kafka/common/requests/BrokerRegistrationRequest.java
+++
b/clients/src/main/java/org/apache/kafka/common/requests/BrokerRegistrationRequest.java
@@ -45,6 +45,10 @@ public class BrokerRegistrationRequest extends
AbstractRequest {
@Override
public BrokerRegistrationRequest build(short version) {
+ if (version < 2) {
+ // Reset the PreviousBrokerEpoch to default if not supported.
+ data.setPreviousBrokerEpoch(new
BrokerRegistrationRequestData().previousBrokerEpoch());
+ }
return new BrokerRegistrationRequest(data, version);
}
diff --git
a/clients/src/test/java/org/apache/kafka/common/requests/BrokerRegistrationRequestTest.java
b/clients/src/test/java/org/apache/kafka/common/requests/BrokerRegistrationRequestTest.java
new file mode 100644
index 00000000000..7b4a08962b1
--- /dev/null
+++
b/clients/src/test/java/org/apache/kafka/common/requests/BrokerRegistrationRequestTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.kafka.common.requests;
+
+import org.apache.kafka.common.Uuid;
+import org.apache.kafka.common.message.BrokerRegistrationRequestData;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class BrokerRegistrationRequestTest {
+ private static Stream<Arguments> BrokerRegistrationRequestVersions() {
+ return
IntStream.range(BrokerRegistrationRequestData.LOWEST_SUPPORTED_VERSION,
+ BrokerRegistrationRequestData.HIGHEST_SUPPORTED_VERSION +
1).mapToObj(version -> Arguments.of((short) version));
+ }
+
+ @ParameterizedTest
+ @MethodSource("BrokerRegistrationRequestVersions")
+ public void testBasicBuild(short version) {
+ Uuid incarnationId = Uuid.randomUuid();
+ BrokerRegistrationRequestData data = new
BrokerRegistrationRequestData();
+ data.setBrokerId(0)
+ .setIsMigratingZkBroker(false)
+ .setClusterId("test")
+ .setFeatures(new BrokerRegistrationRequestData.FeatureCollection())
+ .setIncarnationId(incarnationId)
+ .setListeners(new
BrokerRegistrationRequestData.ListenerCollection())
+ .setRack("a")
+ .setPreviousBrokerEpoch(1L);
+ BrokerRegistrationRequest.Builder builder = new
BrokerRegistrationRequest.Builder(data);
+ BrokerRegistrationRequest request = builder.build(version);
+ assertEquals(0, request.data().brokerId(), request.toString());
+ assertEquals("test", request.data().clusterId(), request.toString());
+ assertEquals(incarnationId, request.data().incarnationId(),
request.toString());
+ assertEquals("a", request.data().rack(), request.toString());
+ if (version < 2) {
+ assertEquals(-1, request.data().previousBrokerEpoch(),
request.toString());
+ } else {
+ assertEquals(1, request.data().previousBrokerEpoch(),
request.toString());
+ }
+ }
+}
\ No newline at end of file
