You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/01/19 09:16:34 UTC
[GitHub] sijie closed pull request #1016: proto/*Processor: clean up logging, include exception stack
sijie closed pull request #1016: proto/*Processor: clean up logging, include exception stack
URL: https://github.com/apache/bookkeeper/pull/1016
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/proto/ReadEntryProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java
index 7849ca81a..b450a5a9f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java
@@ -93,17 +93,17 @@ protected void processPacket() {
errorCode = BookieProtocol.EOK;
}
} catch (InterruptedException ie) {
- LOG.error("Interrupting fence read entry " + read, ie);
+ LOG.error("Interrupting fence read entry {}", read, ie);
errorCode = BookieProtocol.EIO;
data.release();
data = null;
} catch (ExecutionException ee) {
- LOG.error("Failed to fence read entry " + read, ee);
+ LOG.error("Failed to fence read entry {}", read, ee);
errorCode = BookieProtocol.EIO;
data.release();
data = null;
} catch (TimeoutException te) {
- LOG.error("Timeout to fence read entry " + read, te);
+ LOG.error("Timeout to fence read entry {}", read, te);
errorCode = BookieProtocol.EIO;
data.release();
data = null;
@@ -112,22 +112,20 @@ protected void processPacket() {
errorCode = BookieProtocol.EOK;
}
} catch (Bookie.NoLedgerException e) {
- if (LOG.isTraceEnabled()) {
- LOG.error("Error reading " + read, e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error reading {}", read, e);
}
errorCode = BookieProtocol.ENOLEDGER;
} catch (Bookie.NoEntryException e) {
- if (LOG.isTraceEnabled()) {
- LOG.error("Error reading " + read, e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error reading {}", read, e);
}
errorCode = BookieProtocol.ENOENTRY;
} catch (IOException e) {
- if (LOG.isTraceEnabled()) {
- LOG.error("Error reading " + read, e);
- }
+ LOG.error("Error reading {}", read, e);
errorCode = BookieProtocol.EIO;
} catch (BookieException e) {
- LOG.error("Unauthorized access to ledger " + read.getLedgerId(), e);
+ LOG.error("Unauthorized access to ledger {}", read.getLedgerId(), e);
errorCode = BookieProtocol.EUA;
} catch (Throwable t) {
LOG.error("Unexpected exception reading at {}:{} : {}", read.getLedgerId(), read.getEntryId(),
@@ -136,7 +134,7 @@ protected void processPacket() {
}
if (LOG.isTraceEnabled()) {
- LOG.trace("Read entry rc = {} for {}", new Object[] { errorCode, read });
+ LOG.trace("Read entry rc = {} for {}", errorCode, read);
}
if (errorCode == BookieProtocol.EOK) {
requestProcessor.readEntryStats.registerSuccessfulEvent(MathUtils.elapsedNanos(startTimeNanos),
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadLacProcessorV3.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadLacProcessorV3.java
index f3faf769c..85c4a3302 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadLacProcessorV3.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadLacProcessorV3.java
@@ -78,7 +78,7 @@ private ReadLacResponse getReadLacResponse() {
}
} catch (Bookie.NoLedgerException e) {
status = StatusCode.ENOLEDGER;
- logger.error("No ledger found while performing readLac from ledger: {}", ledgerId);
+ logger.error("No ledger found while performing readLac from ledger: {}", ledgerId, e);
} catch (IOException e) {
status = StatusCode.EIO;
logger.error("IOException while performing readLac from ledger: {}", ledgerId);
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3.java
index 5c4762797..2cb1238d8 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3.java
@@ -116,12 +116,12 @@ public void writeComplete(int rc, long ledgerId, long entryId,
entryId, ledgerId, e);
status = StatusCode.EIO;
} catch (BookieException.LedgerFencedException e) {
- logger.debug("Ledger fenced while writing entry:{} to ledger:{}",
- entryId, ledgerId);
+ logger.error("Ledger fenced while writing entry:{} to ledger:{}",
+ entryId, ledgerId, e);
status = StatusCode.EFENCED;
} catch (BookieException e) {
logger.error("Unauthorized access to ledger:{} while writing entry:{}",
- ledgerId, entryId);
+ ledgerId, entryId, e);
status = StatusCode.EUA;
} catch (Throwable t) {
logger.error("Unexpected exception while writing {}@{} : ",
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteLacProcessorV3.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteLacProcessorV3.java
index 7fc92bbf7..dd4dc3c1c 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteLacProcessorV3.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteLacProcessorV3.java
@@ -73,16 +73,16 @@ private WriteLacResponse getWriteLacResponse() {
requestProcessor.bookie.setExplicitLac(Unpooled.wrappedBuffer(lacToAdd), channel, masterKey);
status = StatusCode.EOK;
} catch (IOException e) {
- logger.error("Error saving lac for ledger:{}",
+ logger.error("Error saving lac {} for ledger:{}",
lac, ledgerId, e);
status = StatusCode.EIO;
} catch (BookieException e) {
logger.error("Unauthorized access to ledger:{} while adding lac:{}",
- ledgerId, lac);
+ ledgerId, lac, e);
status = StatusCode.EUA;
} catch (Throwable t) {
- logger.error("Unexpected exception while writing {}@{} : ",
- new Object[] { lac, t });
+ logger.error("Unexpected exception while writing lac {} for ledger:{}",
+ lac, ledgerId, t);
// some bad request which cause unexpected exception
status = StatusCode.EBADREQ;
}
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services