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 2019/03/11 15:07:09 UTC
[bookkeeper] 01/02: Merge remote-tracking branch 'origin/master'
into bk-replace-bookieid
This is an automated email from the ASF dual-hosted git repository.
ivank pushed a commit to branch bk-replace-bookieid
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 0e3d42426e41f4e794ae7c63f3cefb33b15f38da
Merge: 49d9aa3 5a34488
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Mon Mar 11 16:03:48 2019 +0100
Merge remote-tracking branch 'origin/master' into bk-replace-bookieid
.../java/org/apache/bookkeeper/bookie/Bookie.java | 79 +++---------
.../org/apache/bookkeeper/bookie/BookieShell.java | 70 ++---------
.../org/apache/bookkeeper/bookie/BookieStatus.java | 11 +-
.../java/org/apache/bookkeeper/bookie/Cookie.java | 11 +-
.../org/apache/bookkeeper/bookie/EntryLogger.java | 20 +--
.../bookkeeper/bookie/LedgerDirsMonitor.java | 29 +++--
.../RackawareEnsemblePlacementPolicyImpl.java | 4 +-
.../bookkeeper/net/AbstractDNSToSwitchMapping.java | 7 ++
.../apache/bookkeeper/net/ScriptBasedMapping.java | 35 +++++-
.../tools/cli/commands/bookie/FormatCommand.java | 109 +++++++++++++++++
.../tools/cli/commands/bookies/InfoCommand.java | 103 ++++++++++++++++
.../bookie/BookieInitializationTest.java | 4 +-
.../bookie/BookieStorageThresholdTest.java | 19 ++-
.../apache/bookkeeper/bookie/CompactionTest.java | 2 +-
.../bookkeeper/bookie/IndexPersistenceMgrTest.java | 4 +-
.../bookkeeper/bookie/TestLedgerDirsManager.java | 11 +-
...ackawareEnsemblePlacementPolicyUsingScript.java | 58 +++++++++
.../distributedlog/ReadAheadEntryReader.java | 121 ++++++++++++------
.../apache/distributedlog/TestCancelledRead.java | 76 ++++++++++++
.../tools/cli/commands/BookieCommandGroup.java | 2 +
.../tools/cli/commands/BookiesCommandGroup.java | 2 +
.../cli/commands/bookie/FormatCommandTest.java | 136 +++++++++++++++++++++
.../cli/commands/bookies/InfoCommandTest.java | 97 +++++++++++++++
23 files changed, 778 insertions(+), 232 deletions(-)