Skip to content

indexDir compatible fix for issue #3430 #3433

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

Merged
hangc0276 merged 1 commit into from
Jul 31, 2022
Merged

indexDir compatible fix for issue #3430 #3433

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
15 changes: 6 additions & 9 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.apache.bookkeeper.versioning.LongVersion;
import org.apache.bookkeeper.versioning.Version;
import org.apache.bookkeeper.versioning.Versioned;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -137,18 +138,14 @@ private boolean verifyLedgerDirs(Cookie c, boolean checkIfSuperSet) {
}

private boolean verifyIndexDirs(Cookie c, boolean checkIfSuperSet) {
// Compatible with old cookie
if (null == indexDirs && null == c.indexDirs) {
return true;
}
if (null == indexDirs || null == c.indexDirs) {
return false;
}
// compatible logic: existed node's cookie has no indexDirs, the indexDirs's default value is ledgerDirs.
String indexDirsInConfig = StringUtils.isNotBlank(indexDirs) ? indexDirs : ledgerDirs;
String indexDirsInCookie = StringUtils.isNotBlank(c.indexDirs) ? c.indexDirs : c.ledgerDirs;

if (!checkIfSuperSet) {
return indexDirs.equals(c.indexDirs);
return indexDirsInConfig.equals(indexDirsInCookie);
} else {
return isSuperSet(decodeDirPathFromCookie(indexDirs), decodeDirPathFromCookie(c.indexDirs));
return isSuperSet(decodeDirPathFromCookie(indexDirsInConfig), decodeDirPathFromCookie(indexDirsInCookie));
}
}

Expand Down
30 changes: 30 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieIndexDirTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,4 +970,34 @@ public void testBookieIdSetting() throws Exception {
cookie.writeToRegistrationManager(rm, conf, version1);
Assert.assertTrue(cookie.toString().contains(customBookieId));
}

/**
* Compatibility test
* 1. First create bookie without indexDirName
* 2. Configure indexDirName to start bookie
*/
@Test
public void testNewBookieStartingWithOldCookie() throws Exception {
String journalDir = newDirectory();
String[] ledgerDirs = {newDirectory(), newDirectory()};
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
conf.setJournalDirName(journalDir)
.setLedgerDirNames(ledgerDirs)
.setBookiePort(bookiePort)
.setMetadataServiceUri(zkUtil.getMetadataServiceUri());
validateConfig(conf);

conf = TestBKConfiguration.newServerConfiguration();
conf.setJournalDirName(journalDir)
.setLedgerDirNames(ledgerDirs)
.setIndexDirName(ledgerDirs)
.setBookiePort(bookiePort)
.setMetadataServiceUri(zkUtil.getMetadataServiceUri());
try {
validateConfig(conf);
} catch (InvalidCookieException ice) {
// error behaviour
fail("Validate failed, error info: " + ice.getMessage());
}
}
}