root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

KAFKA-16094: BrokerRegistrationRequest.logDirs field must be ignorable (#15153) 

3.7 brokers must be able to register with 3.6 and earlier controllers. Currently, this is broken
because we will unconditionally try to set logDirs, but this field cannot be sent with
BrokerRegistrationRequest versions older than v2. This PR marks the logDirs field as "ignorable."
Marking the field as "ignorable" means that we will still be able to send the
BrokerRegistrationRequest even if the schema doesn't support logDirs.

Reviewers: Ron Dagostino  <rdagostino@confluent.io>
This commit is contained in:
Colin Patrick McCabe 2024-01-09 15:04:27 -08:00 committed by GitHub
parent c7e1fdca64
commit aa7ba7bd5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/src/main/resources/common/message/BrokerRegistrationRequest.json
View File

@ -59,7 +59,7 @@
{ "name": "IsMigratingZkBroker", "type": "bool", "versions": "1+", "default": "false",
"about": "If the required configurations for ZK migration are present, this value is set to true" },
{ "name": "LogDirs", "type": "[]uuid", "versions": "2+",
"about": "Log directories configured in this broker which are available." },
"about": "Log directories configured in this broker which are available.", "ignorable": true },
{ "name": "PreviousBrokerEpoch", "type": "int64", "versions": "3+", "default": "-1", "ignorable": true,
"about": "The epoch before a clean shutdown." }
]

4
clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
View File

@ -3502,7 +3502,9 @@ public class RequestResponseTest {
new BrokerRegistrationRequestData.Feature()).iterator()))
.setListeners(new BrokerRegistrationRequestData.ListenerCollection(singletonList(
new BrokerRegistrationRequestData.Listener()).iterator()))
.setIncarnationId(Uuid.randomUuid());
.setIncarnationId(Uuid.randomUuid())
.setLogDirs(Arrays.asList(Uuid.fromString("qaJjNJ05Q36kEgeTBDcj0Q")))
.setPreviousBrokerEpoch(123L);
return new BrokerRegistrationRequest.Builder(data).build(v);
}