Skip to content

[improve] Fix indexDirs upgrade failed #3762

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
StevenLuMT merged 5 commits into from
Mar 13, 2023
Merged

[improve] Fix indexDirs upgrade failed #3762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e23797
fix indexDirs upgrade failed
wenbingshen Feb 2, 2023
455927a
fix checkstyle
wenbingshen Feb 2, 2023
55ecd2c
improve arrays check equals or not
wenbingshen Feb 3, 2023
643e569
fix checkstyle
wenbingshen Feb 3, 2023
2dcd69a
fix check dirs equals function
wenbingshen Feb 3, 2023
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
13 changes: 11 additions & 2 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.bookkeeper.meta.MetadataDrivers.runFunctionWithRegistrationManager;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.UncheckedExecutionException;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -96,10 +98,17 @@ public boolean accept(File dir, String name) {
}
};

private static List<File> getAllDirectories(ServerConfiguration conf) {
@VisibleForTesting
public static List<File> getAllDirectories(ServerConfiguration conf) {
List<File> dirs = new ArrayList<>();
dirs.addAll(Lists.newArrayList(conf.getJournalDirs()));
Collections.addAll(dirs, conf.getLedgerDirs());
final File[] ledgerDirs = conf.getLedgerDirs();
final File[] indexDirs = conf.getIndexDirs();
if (indexDirs != null && indexDirs.length == ledgerDirs.length
&& !Arrays.asList(indexDirs).containsAll(Arrays.asList(ledgerDirs))) {
dirs.addAll(Lists.newArrayList(indexDirs));
}
Collections.addAll(dirs, ledgerDirs);
return dirs;
}

Expand Down
133 changes: 126 additions & 7 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

package org.apache.bookkeeper.bookie;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

Expand All @@ -36,6 +37,7 @@
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.Arrays;
import java.util.List;
import org.apache.bookkeeper.client.ClientUtil;
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.conf.ServerConfiguration;
Expand All @@ -62,6 +64,28 @@ public UpgradeTest() {
super(0);
}

static void writeLedgerDirWithIndexDir(File ledgerDir,
File indexDir,
byte[] masterKey)
throws Exception {
long ledgerId = 1;

File fn = new File(indexDir, IndexPersistenceMgr.getLedgerName(ledgerId));
fn.getParentFile().mkdirs();
FileInfo fi = new FileInfo(fn, masterKey, FileInfo.CURRENT_HEADER_VERSION);
// force creation of index file
fi.write(new ByteBuffer[]{ ByteBuffer.allocate(0) }, 0);
fi.close(true);

long logId = 0;
ByteBuffer logfileHeader = ByteBuffer.allocate(1024);
logfileHeader.put("BKLO".getBytes());
FileChannel logfile = new RandomAccessFile(
new File(ledgerDir, Long.toHexString(logId) + ".log"), "rw").getChannel();
logfile.write((ByteBuffer) logfileHeader.clear());
logfile.close();
}

static void writeLedgerDir(File dir,
byte[] masterKey)
throws Exception {
Expand Down Expand Up @@ -122,6 +146,12 @@ static File initV1LedgerDirectory(File d) throws Exception {
return d;
}

static File initV1LedgerDirectoryWithIndexDir(File ledgerDir,
File indexDir) throws Exception {
writeLedgerDirWithIndexDir(ledgerDir, indexDir, "foobar".getBytes());
return ledgerDir;
}

static void createVersion2File(File dir) throws Exception {
File versionFile = new File(dir, "VERSION");

Expand All @@ -148,12 +178,21 @@ static File initV2LedgerDirectory(File d) throws Exception {
return d;
}

private static void testUpgradeProceedure(String zkServers, String journalDir, String ledgerDir) throws Exception {
static File initV2LedgerDirectoryWithIndexDir(File ledgerDir, File indexDir) throws Exception {
initV1LedgerDirectoryWithIndexDir(ledgerDir, indexDir);
createVersion2File(ledgerDir);
createVersion2File(indexDir);
return ledgerDir;
}

private static void testUpgradeProceedure(String zkServers, String journalDir, String ledgerDir, String indexDir)
throws Exception {
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
conf.setMetadataServiceUri("zk://" + zkServers + "/ledgers");
conf.setJournalDirName(journalDir)
.setLedgerDirNames(new String[] { ledgerDir })
.setBookiePort(bookiePort);
.setLedgerDirNames(new String[]{ledgerDir})
.setIndexDirName(new String[]{indexDir})
.setBookiePort(bookiePort);
Bookie b = null;

try (MetadataBookieDriver metadataDriver = BookieResources.createMetadataDriver(
Expand Down Expand Up @@ -211,21 +250,62 @@ private static void testUpgradeProceedure(String zkServers, String journalDir, S
public void testUpgradeV1toCurrent() throws Exception {
File journalDir = initV1JournalDirectory(tmpDirs.createNew("bookie", "journal"));
File ledgerDir = initV1LedgerDirectory(tmpDirs.createNew("bookie", "ledger"));
testUpgradeProceedure(zkUtil.getZooKeeperConnectString(), journalDir.getPath(), ledgerDir.getPath());
testUpgradeProceedure(zkUtil.getZooKeeperConnectString(), journalDir.getPath(),
ledgerDir.getPath(), ledgerDir.getPath());
}

@Test
public void testUpgradeV1toCurrentWithIndexDir() throws Exception {
File journalDir = initV1JournalDirectory(tmpDirs.createNew("bookie", "journal"));
File indexDir = tmpDirs.createNew("bookie", "index");
File ledgerDir = initV1LedgerDirectoryWithIndexDir(
tmpDirs.createNew("bookie", "ledger"), indexDir);
testUpgradeProceedure(zkUtil.getZooKeeperConnectString(), journalDir.getPath(),
ledgerDir.getPath(), indexDir.getPath());
}

@Test
public void testUpgradeV2toCurrent() throws Exception {
File journalDir = initV2JournalDirectory(tmpDirs.createNew("bookie", "journal"));
File ledgerDir = initV2LedgerDirectory(tmpDirs.createNew("bookie", "ledger"));
testUpgradeProceedure(zkUtil.getZooKeeperConnectString(), journalDir.getPath(), ledgerDir.getPath());
File indexDir = tmpDirs.createNew("bookie", "index");
testUpgradeProceedure(zkUtil.getZooKeeperConnectString(), journalDir.getPath(),
ledgerDir.getPath(), indexDir.getPath());
}

@Test
public void testUpgradeV2toCurrentWithIndexDir() throws Exception {
File journalDir = initV2JournalDirectory(tmpDirs.createNew("bookie", "journal"));
File indexDir = tmpDirs.createNew("bookie", "index");
File ledgerDir = initV2LedgerDirectoryWithIndexDir(
tmpDirs.createNew("bookie", "ledger"), indexDir);
testUpgradeProceedure(zkUtil.getZooKeeperConnectString(), journalDir.getPath(),
ledgerDir.getPath(), indexDir.getPath());
}

@Test
public void testUpgradeCurrent() throws Exception {
testUpgradeCurrent(false);
}

@Test
public void testUpgradeCurrentWithIndexDir() throws Exception {
testUpgradeCurrent(true);
}

public void testUpgradeCurrent(boolean hasIndexDir) throws Exception {
File journalDir = initV2JournalDirectory(tmpDirs.createNew("bookie", "journal"));
File ledgerDir = initV2LedgerDirectory(tmpDirs.createNew("bookie", "ledger"));
testUpgradeProceedure(zkUtil.getZooKeeperConnectString(), journalDir.getPath(), ledgerDir.getPath());
File ledgerDir = tmpDirs.createNew("bookie", "ledger");
File indexDir = ledgerDir;
if (hasIndexDir) {
indexDir = tmpDirs.createNew("bookie", "index");
initV2LedgerDirectoryWithIndexDir(ledgerDir, indexDir);
} else {
initV2LedgerDirectory(ledgerDir);
}

testUpgradeProceedure(zkUtil.getZooKeeperConnectString(), journalDir.getPath(),
ledgerDir.getPath(), indexDir.getPath());

// Upgrade again
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
Expand Down Expand Up @@ -278,4 +358,43 @@ public void testCommandLine() throws Exception {
System.setErr(origerr);
}
}

@Test
public void testFSUGetAllDirectories() throws Exception {
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
final File journalDir = tmpDirs.createNew("bookie", "journal");
final File ledgerDir1 = tmpDirs.createNew("bookie", "ledger");
final File ledgerDir2 = tmpDirs.createNew("bookie", "ledger");

// test1
conf.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[]{ledgerDir1.getPath(), ledgerDir2.getPath()})
.setIndexDirName(new String[]{ledgerDir1.getPath(), ledgerDir2.getPath()});
List<File> allDirectories = FileSystemUpgrade.getAllDirectories(conf);
assertEquals(3, allDirectories.size());

// test2
conf.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[]{ledgerDir1.getPath(), ledgerDir2.getPath()})
.setIndexDirName(new String[]{ledgerDir2.getPath(), ledgerDir1.getPath()});
allDirectories = FileSystemUpgrade.getAllDirectories(conf);
assertEquals(3, allDirectories.size());

final File indexDir1 = tmpDirs.createNew("bookie", "index");
final File indexDir2 = tmpDirs.createNew("bookie", "index");

// test3
conf.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[]{ledgerDir1.getPath(), ledgerDir2.getPath()})
.setIndexDirName(new String[]{indexDir1.getPath(), indexDir2.getPath()});
allDirectories = FileSystemUpgrade.getAllDirectories(conf);
assertEquals(5, allDirectories.size());

// test4
conf.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[]{ledgerDir1.getPath(), ledgerDir2.getPath()})
.setIndexDirName(new String[]{indexDir2.getPath(), indexDir1.getPath()});
allDirectories = FileSystemUpgrade.getAllDirectories(conf);
assertEquals(5, allDirectories.size());
}
}