You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2020/10/08 04:27:46 UTC
[bookkeeper] branch master updated: fix #2416 bookie format
redundant clean ledgerDirs and indexDirs (#2417)
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new a68c3d6 fix #2416 bookie format redundant clean ledgerDirs and indexDirs (#2417)
a68c3d6 is described below
commit a68c3d661dbf9f7523939ecd4016209288bb5496
Author: 张哈希 <zh...@vip.sina.com>
AuthorDate: Thu Oct 8 04:27:40 2020 +0000
fix #2416 bookie format redundant clean ledgerDirs and indexDirs (#2417)
bookie format redundant clean ledgerDirs and indexDirs
---
.../java/org/apache/bookkeeper/bookie/Bookie.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
index 7e8452a..7f079f4 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
@@ -1558,25 +1558,25 @@ public class Bookie extends BookieCriticalThread {
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");