Skip to content

fix #2416 bookie format redundant clean ledgerDirs and indexDirs #2417

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
sijie merged 4 commits into from
Oct 8, 2020
Merged

fix #2416 bookie format redundant clean ledgerDirs and indexDirs #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fb0f14
fix #2416
Sep 24, 2020
2c3d8f5
fix doc (#2419)
lifepuzzlefun Sep 26, 2020
54bc6f0
fix #2416
Sep 24, 2020
37b4aba
Merge remote-tracking branch 'origin/fix_issue_2416' into fix_issue_2416
Sep 28, 2020
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
26 changes: 13 additions & 13 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1558,25 +1558,25 @@ public static boolean format(ServerConfiguration conf,
LOG.error("Formatting journal directory failed");
return false;
}
}

File[] ledgerDirs = conf.getLedgerDirs();
for (File dir : ledgerDirs) {
if (!cleanDir(dir)) {
LOG.error("Formatting ledger directory " + dir + " failed");
return false;
}
}

File[] ledgerDirs = conf.getLedgerDirs();
for (File dir : ledgerDirs) {
// Clean up index directories if they are separate from the ledger dirs
File[] indexDirs = conf.getIndexDirs();
if (null != indexDirs) {
for (File dir : indexDirs) {
if (!cleanDir(dir)) {
LOG.error("Formatting ledger directory " + dir + " failed");
return false;
}
}

// Clean up index directories if they are separate from the ledger dirs
File[] indexDirs = conf.getIndexDirs();
if (null != indexDirs) {
for (File dir : indexDirs) {
if (!cleanDir(dir)) {
LOG.error("Formatting ledger directory " + dir + " failed");
return false;
}
}
}
}

LOG.info("Bookie format completed successfully");
Expand Down
4 changes: 2 additions & 2 deletions site/_data/cli/shell.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ commands:
use this command to update ledger metadata by replacing src-bookie to dest-bookie where data has been copied/moved.
Start the bookie process on dest-bookie and dest-bookie will serve copied ledger data from src-bookie.
options:
- flag: -srcBookie <bookie-id>
- flag: -srcBookie BOOKIE_ID
description: Source Bookie Id
- flag: -destBookie <bookie-id>
- flag: -destBookie BOOKIE_ID
description: Destination Bookie Id
- flag: -updatespersec N
description: Number of ledgers updating per second (default 5 per sec)
Expand Down