goiri commented on code in PR #4561:
URL: https://github.com/apache/hadoop/pull/4561#discussion_r921726293
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java:
##########
@@ -394,46 +352,39 @@ public ListenableFuture<Void> sendEdits(
ListenableFuture<Void> ret = null;
try {
- ret = singleThreadExecutor.submit(new Callable<Void>() {
- @Override
- public Void call() throws IOException {
- throwIfOutOfSync();
-
- long rpcSendTimeNanos = System.nanoTime();
- try {
- getProxy().journal(createReqInfo(),
- segmentTxId, firstTxnId, numTxns, data);
- } catch (IOException e) {
- QuorumJournalManager.LOG.warn(
- "Remote journal " + IPCLoggerChannel.this + " failed to " +
- "write txns " + firstTxnId + "-" + (firstTxnId + numTxns - 1) +
- ". Will try to write to this JN again after the next " +
- "log roll.", e);
- synchronized (IPCLoggerChannel.this) {
- outOfSync = true;
- }
- throw e;
- } finally {
- long now = System.nanoTime();
- long rpcTime = TimeUnit.MICROSECONDS.convert(
- now - rpcSendTimeNanos, TimeUnit.NANOSECONDS);
- long endToEndTime = TimeUnit.MICROSECONDS.convert(
- now - submitNanos, TimeUnit.NANOSECONDS);
- metrics.addWriteEndToEndLatency(endToEndTime);
- metrics.addWriteRpcLatency(rpcTime);
- if (rpcTime / 1000 > WARN_JOURNAL_MILLIS_THRESHOLD) {
- QuorumJournalManager.LOG.warn(
- "Took " + (rpcTime / 1000) + "ms to send a batch of " +
- numTxns + " edits (" + data.length + " bytes) to " +
- "remote journal " + IPCLoggerChannel.this);
- }
- }
+ ret = singleThreadExecutor.submit(() -> {
+ throwIfOutOfSync();
+
+ long rpcSendTimeNanos = System.nanoTime();
+ try {
+ getProxy().journal(createReqInfo(), segmentTxId, firstTxnId,
numTxns, data);
+ } catch (IOException e) {
+ QuorumJournalManager.LOG.warn("Remote journal {} failed to write
txns {}-{}."
+ + " Will try to write to this JN again after the next log
roll.",
+ IPCLoggerChannel.this, firstTxnId, (firstTxnId + numTxns - 1),
e);
synchronized (IPCLoggerChannel.this) {
- highestAckedTxId = firstTxnId + numTxns - 1;
- lastAckNanos = submitNanos;
+ outOfSync = true;
}
- return null;
+ throw e;
+ } finally {
+ long now = System.nanoTime();
+ long rpcTime = TimeUnit.MICROSECONDS.convert(
+ now - rpcSendTimeNanos, TimeUnit.NANOSECONDS);
+ long endToEndTime = TimeUnit.MICROSECONDS.convert(
Review Comment:
endToEndTimeMs?
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java:
##########
@@ -394,46 +352,39 @@ public ListenableFuture<Void> sendEdits(
ListenableFuture<Void> ret = null;
try {
- ret = singleThreadExecutor.submit(new Callable<Void>() {
- @Override
- public Void call() throws IOException {
- throwIfOutOfSync();
-
- long rpcSendTimeNanos = System.nanoTime();
- try {
- getProxy().journal(createReqInfo(),
- segmentTxId, firstTxnId, numTxns, data);
- } catch (IOException e) {
- QuorumJournalManager.LOG.warn(
- "Remote journal " + IPCLoggerChannel.this + " failed to " +
- "write txns " + firstTxnId + "-" + (firstTxnId + numTxns - 1) +
- ". Will try to write to this JN again after the next " +
- "log roll.", e);
- synchronized (IPCLoggerChannel.this) {
- outOfSync = true;
- }
- throw e;
- } finally {
- long now = System.nanoTime();
- long rpcTime = TimeUnit.MICROSECONDS.convert(
- now - rpcSendTimeNanos, TimeUnit.NANOSECONDS);
- long endToEndTime = TimeUnit.MICROSECONDS.convert(
- now - submitNanos, TimeUnit.NANOSECONDS);
- metrics.addWriteEndToEndLatency(endToEndTime);
- metrics.addWriteRpcLatency(rpcTime);
- if (rpcTime / 1000 > WARN_JOURNAL_MILLIS_THRESHOLD) {
- QuorumJournalManager.LOG.warn(
- "Took " + (rpcTime / 1000) + "ms to send a batch of " +
- numTxns + " edits (" + data.length + " bytes) to " +
- "remote journal " + IPCLoggerChannel.this);
- }
- }
+ ret = singleThreadExecutor.submit(() -> {
+ throwIfOutOfSync();
+
+ long rpcSendTimeNanos = System.nanoTime();
+ try {
+ getProxy().journal(createReqInfo(), segmentTxId, firstTxnId,
numTxns, data);
+ } catch (IOException e) {
+ QuorumJournalManager.LOG.warn("Remote journal {} failed to write
txns {}-{}."
+ + " Will try to write to this JN again after the next log
roll.",
+ IPCLoggerChannel.this, firstTxnId, (firstTxnId + numTxns - 1),
e);
synchronized (IPCLoggerChannel.this) {
- highestAckedTxId = firstTxnId + numTxns - 1;
- lastAckNanos = submitNanos;
+ outOfSync = true;
}
- return null;
+ throw e;
+ } finally {
+ long now = System.nanoTime();
+ long rpcTime = TimeUnit.MICROSECONDS.convert(
Review Comment:
rpcTimeMs?
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java:
##########
@@ -394,46 +352,39 @@ public ListenableFuture<Void> sendEdits(
ListenableFuture<Void> ret = null;
try {
- ret = singleThreadExecutor.submit(new Callable<Void>() {
- @Override
- public Void call() throws IOException {
- throwIfOutOfSync();
-
- long rpcSendTimeNanos = System.nanoTime();
- try {
- getProxy().journal(createReqInfo(),
- segmentTxId, firstTxnId, numTxns, data);
- } catch (IOException e) {
- QuorumJournalManager.LOG.warn(
- "Remote journal " + IPCLoggerChannel.this + " failed to " +
- "write txns " + firstTxnId + "-" + (firstTxnId + numTxns - 1) +
- ". Will try to write to this JN again after the next " +
- "log roll.", e);
- synchronized (IPCLoggerChannel.this) {
- outOfSync = true;
- }
- throw e;
- } finally {
- long now = System.nanoTime();
- long rpcTime = TimeUnit.MICROSECONDS.convert(
- now - rpcSendTimeNanos, TimeUnit.NANOSECONDS);
- long endToEndTime = TimeUnit.MICROSECONDS.convert(
- now - submitNanos, TimeUnit.NANOSECONDS);
- metrics.addWriteEndToEndLatency(endToEndTime);
- metrics.addWriteRpcLatency(rpcTime);
- if (rpcTime / 1000 > WARN_JOURNAL_MILLIS_THRESHOLD) {
- QuorumJournalManager.LOG.warn(
- "Took " + (rpcTime / 1000) + "ms to send a batch of " +
- numTxns + " edits (" + data.length + " bytes) to " +
- "remote journal " + IPCLoggerChannel.this);
- }
- }
+ ret = singleThreadExecutor.submit(() -> {
+ throwIfOutOfSync();
+
+ long rpcSendTimeNanos = System.nanoTime();
+ try {
+ getProxy().journal(createReqInfo(), segmentTxId, firstTxnId,
numTxns, data);
+ } catch (IOException e) {
+ QuorumJournalManager.LOG.warn("Remote journal {} failed to write
txns {}-{}."
+ + " Will try to write to this JN again after the next log
roll.",
+ IPCLoggerChannel.this, firstTxnId, (firstTxnId + numTxns - 1),
e);
synchronized (IPCLoggerChannel.this) {
- highestAckedTxId = firstTxnId + numTxns - 1;
- lastAckNanos = submitNanos;
+ outOfSync = true;
}
- return null;
+ throw e;
+ } finally {
+ long now = System.nanoTime();
+ long rpcTime = TimeUnit.MICROSECONDS.convert(
Review Comment:
It looks like rpcTimeMicros actually; add the unit in either case.
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java:
##########
@@ -394,46 +352,39 @@ public ListenableFuture<Void> sendEdits(
ListenableFuture<Void> ret = null;
try {
- ret = singleThreadExecutor.submit(new Callable<Void>() {
- @Override
- public Void call() throws IOException {
- throwIfOutOfSync();
-
- long rpcSendTimeNanos = System.nanoTime();
- try {
- getProxy().journal(createReqInfo(),
- segmentTxId, firstTxnId, numTxns, data);
- } catch (IOException e) {
- QuorumJournalManager.LOG.warn(
- "Remote journal " + IPCLoggerChannel.this + " failed to " +
- "write txns " + firstTxnId + "-" + (firstTxnId + numTxns - 1) +
- ". Will try to write to this JN again after the next " +
- "log roll.", e);
- synchronized (IPCLoggerChannel.this) {
- outOfSync = true;
- }
- throw e;
- } finally {
- long now = System.nanoTime();
- long rpcTime = TimeUnit.MICROSECONDS.convert(
- now - rpcSendTimeNanos, TimeUnit.NANOSECONDS);
- long endToEndTime = TimeUnit.MICROSECONDS.convert(
- now - submitNanos, TimeUnit.NANOSECONDS);
- metrics.addWriteEndToEndLatency(endToEndTime);
- metrics.addWriteRpcLatency(rpcTime);
- if (rpcTime / 1000 > WARN_JOURNAL_MILLIS_THRESHOLD) {
- QuorumJournalManager.LOG.warn(
- "Took " + (rpcTime / 1000) + "ms to send a batch of " +
- numTxns + " edits (" + data.length + " bytes) to " +
- "remote journal " + IPCLoggerChannel.this);
- }
- }
+ ret = singleThreadExecutor.submit(() -> {
+ throwIfOutOfSync();
+
+ long rpcSendTimeNanos = System.nanoTime();
+ try {
+ getProxy().journal(createReqInfo(), segmentTxId, firstTxnId,
numTxns, data);
+ } catch (IOException e) {
+ QuorumJournalManager.LOG.warn("Remote journal {} failed to write
txns {}-{}."
+ + " Will try to write to this JN again after the next log
roll.",
+ IPCLoggerChannel.this, firstTxnId, (firstTxnId + numTxns - 1),
e);
synchronized (IPCLoggerChannel.this) {
- highestAckedTxId = firstTxnId + numTxns - 1;
- lastAckNanos = submitNanos;
+ outOfSync = true;
}
- return null;
+ throw e;
+ } finally {
+ long now = System.nanoTime();
Review Comment:
nowNs
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
