You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by iv...@apache.org on 2018/01/26 17:23:40 UTC
[bookkeeper] branch master updated: [MERGE YAHOO REPO] Fix
bookie-shell readJournal by reading from correct journal-directory
This is an automated email from the ASF dual-hosted git repository.
ivank 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 92b5ef5 [MERGE YAHOO REPO] Fix bookie-shell readJournal by reading from correct journal-directory
92b5ef5 is described below
commit 92b5ef5d70594f9d6a76fc2c34e62925248f7327
Author: rdhabalia <rd...@yahoo-inc.com>
AuthorDate: Fri Jan 26 18:23:35 2018 +0100
[MERGE YAHOO REPO] Fix bookie-shell readJournal by reading from correct journal-directory
Descriptions of the changes in this PR:
This is cherry-pick from yahoo repo of branch yahoo-4.3.
original change is:
https://github.com/yahoo/bookkeeper/commit/c426efea
Fix bookie-shell readJournal by reading from correct journal-directory
Author: rdhabalia <rd...@yahoo-inc.com>
Reviewers: Ivan Kelly <iv...@apache.org>, Sijie Guo <si...@apache.org>
This closes #1056 from jiazhai/cherry_picks/i_207
---
.../src/main/java/org/apache/bookkeeper/bookie/BookieShell.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
index 62b4992..51aa79f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
@@ -2955,7 +2955,8 @@ public class BookieShell implements Tool {
if (null == journals) {
journals = Lists.newArrayListWithCapacity(bkConf.getJournalDirs().length);
for (File journalDir : bkConf.getJournalDirs()) {
- journals.add(new Journal(journalDir, bkConf, new LedgerDirsManager(bkConf, bkConf.getLedgerDirs(),
+ journals.add(new Journal(new File(journalDir, BookKeeperConstants.CURRENT_DIR), bkConf,
+ new LedgerDirsManager(bkConf, bkConf.getLedgerDirs(),
new DiskChecker(bkConf.getDiskUsageThreshold(), bkConf.getDiskUsageWarnThreshold()))));
}
}
--
To stop receiving notification emails like this one, please contact
ivank@apache.org.