Skip to content

MINOR: Write bootstrap checkpoint only to metadata directories #22418

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
majialoong wants to merge 1 commit into
base: trunk
Choose a base branch
from
+25 −9
Open

MINOR: Write bootstrap checkpoint only to metadata directories #22418

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions metadata/src/main/java/org/apache/kafka/metadata/storage/Formatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,12 @@ void doFormat(BootstrapMetadata bootstrapMetadata) throws Exception {
build());
}
copier.setPreWriteHandler((writeLogDir, __, ____) -> {
DirectoryType directoryType = directoryTypes.get(writeLogDir);
printStream.printf("Formatting %s %s with %s %s.%n",
directoryTypes.get(writeLogDir).description(), writeLogDir,
directoryType.description(), writeLogDir,
MetadataVersion.FEATURE_NAME, releaseVersion);
Files.createDirectories(Paths.get(writeLogDir));
if (writeBootstrapSnapshot) {
if (writeBootstrapSnapshot && directoryType.isMetadataDirectory()) {
writeBoostrapSnapshot(writeLogDir,
bootstrapMetadata,
initialControllers,
Expand Down Expand Up @@ -480,9 +481,8 @@ String description() {
};
}

boolean isDynamicMetadataDirectory() {
return this == DYNAMIC_METADATA_NON_VOTER_DIRECTORY ||
this == DYNAMIC_METADATA_VOTER_DIRECTORY;
boolean isMetadataDirectory() {
return this != LOG_DIRECTORY;
}

static DirectoryType calculate(
Expand Down
24 changes: 20 additions & 4 deletions metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ public void close() throws Exception {
}
}

private static File clusterMetadataDir(String directory) {
return new File(directory, String.format("%s-%d",
CLUSTER_METADATA_TOPIC_PARTITION.topic(),
CLUSTER_METADATA_TOPIC_PARTITION.partition()));
}

static class FormatterContext {
final Formatter formatter;
final ByteArrayOutputStream stream;
Expand Down Expand Up @@ -154,16 +160,26 @@ public void testDirectories(int numDirs) throws Exception {
}
}

@Test
public void testWritesBootstrapSnapshotOnlyToMetadataDirectory() throws Exception {
try (TestEnv testEnv = new TestEnv(3)) {
testEnv.newFormatter().formatter.run();
assertTrue(clusterMetadataDir(testEnv.directory(0)).exists());
assertFalse(clusterMetadataDir(testEnv.directory(1)).exists());
assertFalse(clusterMetadataDir(testEnv.directory(2)).exists());

BootstrapMetadata bootstrapMetadata = BootstrapTestUtils.readBootstrapMetadata(testEnv.directory(0));
assertEquals(MetadataVersion.latestProduction(), bootstrapMetadata.metadataVersion());
}
}

@Test
public void testSkipsBootstrapSnapshotWhenDisabled() throws Exception {
try (TestEnv testEnv = new TestEnv(1)) {
FormatterContext context = testEnv.newFormatter();
context.formatter.setWriteBootstrapSnapshot(false);
context.formatter.run();
File clusterMetadataDir = new File(testEnv.directory(0), String.format("%s-%d",
CLUSTER_METADATA_TOPIC_PARTITION.topic(),
CLUSTER_METADATA_TOPIC_PARTITION.partition()));
assertFalse(clusterMetadataDir.exists());
assertFalse(clusterMetadataDir(testEnv.directory(0)).exists());
}
}

Expand Down
Loading