athanatos closed pull request #906: Misc fixes
URL: https://github.com/apache/bookkeeper/pull/906
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
index b979b27f1..1192fd9fd 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
@@ -440,7 +440,6 @@ public void run() {
ForceWriteRequest req = null;
try {
req = forceWriteRequests.take();
-
// Force write the file and then notify the write
completions
//
if (!req.isMarker) {
@@ -460,8 +459,8 @@ public void run() {
numReqInLastForceWrite = 0;
}
}
- numReqInLastForceWrite +=
req.process(shouldForceWrite);
}
+ numReqInLastForceWrite += req.process(shouldForceWrite);
if (enableGroupForceWrites
// if its a marker we should switch back to
flushing
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java
index ba4d674b4..7474e56ac 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java
@@ -38,7 +38,7 @@
* are between {@code firstSpeculativeRequestTimeout} and {@code
maxSpeculativeRequestTimeout}.
*/
public class DefaultSpeculativeRequestExecutionPolicy implements
SpeculativeRequestExecutionPolicy {
- private static final Logger LOG =
LoggerFactory.getLogger(PendingReadOp.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(DefaultSpeculativeRequestExecutionPolicy.class);
final int firstSpeculativeRequestTimeout;
final int maxSpeculativeRequestTimeout;
final float backoffMultiplier;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
index f5d8e7f0d..09c7a39a9 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
@@ -322,7 +322,9 @@ public void processResult(int rc, String path, Object ctx) {
@Override
public void registerLedgerMetadataListener(long ledgerId,
LedgerMetadataListener listener) {
if (null != listener) {
- LOG.debug("Registered ledger metadata listener {} on ledger {}.",
listener, ledgerId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Registered ledger metadata listener {} on ledger
{}.", listener, ledgerId);
+ }
Set<LedgerMetadataListener> listenerSet = listeners.get(ledgerId);
if (listenerSet == null) {
Set<LedgerMetadataListener> newListenerSet = new
HashSet<LedgerMetadataListener>();
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java
index 18cecf83a..00db67cff 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java
@@ -385,6 +385,9 @@ public RequestEncoder(ExtensionRegistry extensionRegistry) {
@Override
protected void encode(ChannelHandlerContext ctx, Object msg,
List<Object> out) throws Exception {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Encode request {} to channel {}.", msg,
ctx.channel());
+ }
if (msg instanceof BookkeeperProtocol.Request) {
out.add(reqV3.encode(msg, ctx.alloc()));
} else if (msg instanceof BookieProtocol.Request) {
@@ -413,8 +416,8 @@ protected void encode(ChannelHandlerContext ctx, Object
msg, List<Object> out) t
@Override
protected void decode(ChannelHandlerContext ctx, Object msg,
List<Object> out) throws Exception {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received request {} from channel {} to decode.",
msg, ctx.channel());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Received request {} from channel {} to decode.",
msg, ctx.channel());
}
if (!(msg instanceof ByteBuf)) {
out.add(msg);
@@ -453,8 +456,8 @@ protected void decode(ChannelHandlerContext ctx, Object
msg, List<Object> out) t
@Override
protected void encode(ChannelHandlerContext ctx, Object msg,
List<Object> out)
throws Exception {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Encode response {} to channel {}.", msg,
ctx.channel());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Encode response {} to channel {}.", msg,
ctx.channel());
}
if (msg instanceof BookkeeperProtocol.Response) {
out.add(repV3.encode(msg, ctx.alloc()));
@@ -484,8 +487,8 @@ protected void encode(ChannelHandlerContext ctx, Object
msg, List<Object> out)
@Override
protected void decode(ChannelHandlerContext ctx, Object msg,
List<Object> out) throws Exception {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received response {} from channel {} to decode.",
msg, ctx.channel());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Received response {} from channel {} to decode.",
msg, ctx.channel());
}
if (!(msg instanceof ByteBuf)) {
out.add(msg);
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
index f402a9492..c60a997a2 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
@@ -80,6 +80,8 @@ public void testCorruptEntryLog() throws Exception {
int gcWaitTime = 1000;
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
+ conf.setJournalDirName(tmpDir.toString());
+
conf.setGcWaitTime(gcWaitTime);
conf.setLedgerDirNames(new String[] {tmpDir.toString()});
Bookie bookie = new Bookie(conf);
@@ -120,6 +122,7 @@ public void testMissingLogId() throws Exception {
Bookie.checkDirectoryStructure(curDir);
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
+ conf.setJournalDirName(tmpDir.toString());
conf.setLedgerDirNames(new String[] {tmpDir.toString()});
Bookie bookie = new Bookie(conf);
// create some entries
@@ -206,6 +209,7 @@ public void testAddEntryFailureOnDiskFull() throws
Exception {
File ledgerDir1 = createTempDir("bkTest", ".dir");
File ledgerDir2 = createTempDir("bkTest", ".dir");
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
+ conf.setJournalDirName(ledgerDir1.toString());
conf.setLedgerDirNames(new String[] { ledgerDir1.getAbsolutePath(),
ledgerDir2.getAbsolutePath() });
Bookie bookie = new Bookie(conf);
@@ -240,6 +244,8 @@ public void testRecoverFromLedgersMap() throws Exception {
int gcWaitTime = 1000;
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
+ conf.setJournalDirName(tmpDir.toString());
+
conf.setGcWaitTime(gcWaitTime);
conf.setLedgerDirNames(new String[] {tmpDir.toString()});
Bookie bookie = new Bookie(conf);
@@ -276,6 +282,7 @@ public void testRecoverFromLedgersMapOnV0EntryLog() throws
Exception {
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
conf.setGcWaitTime(gcWaitTime);
conf.setLedgerDirNames(new String[] { tmpDir.toString() });
+ conf.setJournalDirName(tmpDir.toString());
Bookie bookie = new Bookie(conf);
// create some entries
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
index 53083af88..2fe5e75db 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
@@ -272,6 +272,7 @@ public void testLedgerCacheFlushFailureOnDiskFull() throws
Exception {
File ledgerDir2 = createTempDir("bkTest", ".dir");
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
conf.setLedgerDirNames(new String[] { ledgerDir1.getAbsolutePath(),
ledgerDir2.getAbsolutePath() });
+ conf.setJournalDirName(ledgerDir1.toString());
Bookie bookie = new Bookie(conf);
InterleavedLedgerStorage ledgerStorage = ((InterleavedLedgerStorage)
bookie.ledgerStorage);
@@ -517,6 +518,7 @@ public void testEntryMemTableFlushFailure() throws
Exception {
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
conf.setGcWaitTime(gcWaitTime);
conf.setLedgerDirNames(new String[] { tmpDir.toString() });
+ conf.setJournalDirName(tmpDir.toString());
conf.setLedgerStorageClass(FlushTestSortedLedgerStorage.class.getName());
Bookie bookie = new Bookie(conf);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
