Skip to content

MINOR: Validate the node id inside LocalTieredStorage#nodeId #23020

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

Open
mingyen066 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+8 −12
Open

MINOR: Validate the node id inside LocalTieredStorage#nodeId #23020

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 8 additions & 12 deletions .../src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,16 +227,19 @@ public void addListener(final LocalTieredStorageListener listener) {
this.storageListeners.add(listener);
}

private Integer nodeId(final Map<String, ?> configs) {
private int nodeId(final Map<String, ?> configs) {
final Integer nodeId = (Integer) configs.get(NODE_ID);
if (nodeId != null) {
return nodeId;
}
final Integer brokerId = (Integer) configs.get(BROKER_ID);
if (brokerId != null) {
logger.warn("The '{}' config is deprecated and will no longer be read in Apache Kafka 5.0. Please use '{}' instead.",
BROKER_ID, NODE_ID);
if (brokerId == null) {
throw new InvalidConfigurationException(format(
"Both %s and %s configs are missing. Please configure %s to use the LocalTieredStorage manager.",
NODE_ID, BROKER_ID, NODE_ID));
}
logger.warn("The '{}' config is deprecated and will no longer be read in Apache Kafka 5.0. Please use '{}' instead.",
BROKER_ID, NODE_ID);
return brokerId;
}

Expand All @@ -252,15 +255,8 @@ public void configure(Map<String, ?> configs) {
final String shouldDeleteOnClose = (String) configs.get(DELETE_ON_CLOSE_CONFIG);
final String transfererClass = (String) configs.get(TRANSFERER_CLASS_CONFIG);
final String isDeleteEnabled = (String) configs.get(ENABLE_DELETE_API_CONFIG);
final Integer nodeIdInt = nodeId(configs);

if (nodeIdInt == null) {
throw new InvalidConfigurationException(format(
"Both %s and %s configs are missing. Please configure %s to use the LocalTieredStorage manager.",
NODE_ID, BROKER_ID, NODE_ID));
}

brokerId = nodeIdInt;
brokerId = nodeId(configs);
logger = new LogContext(format("[LocalTieredStorage Id=%d] ", brokerId)).logger(this.getClass());

if (shouldDeleteOnClose != null) {
Expand Down
Loading