HDFS-12814. Add blockId when warning slow mirror/disk in BlockReceiver. Contributed by Jiandan Yang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/462e25a3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/462e25a3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/462e25a3 Branch: refs/heads/YARN-5881 Commit: 462e25a3b264e1148d0cbca00db7f10d43a0555f Parents: 09a1342 Author: Weiwei Yang <w...@apache.org> Authored: Thu Nov 16 16:19:53 2017 +0800 Committer: Weiwei Yang <w...@apache.org> Committed: Thu Nov 16 16:19:53 2017 +0800 ---------------------------------------------------------------------- .../hadoop/hdfs/server/datanode/BlockReceiver.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/462e25a3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java index 8d91f04..c052d52 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java @@ -434,7 +434,8 @@ class BlockReceiver implements Closeable { if (duration > datanodeSlowLogThresholdMs && LOG.isWarnEnabled()) { LOG.warn("Slow flushOrSync took " + duration + "ms (threshold=" + datanodeSlowLogThresholdMs + "ms), isSync:" + isSync + ", flushTotalNanos=" - + flushTotalNanos + "ns, volume=" + getVolumeBaseUri()); + + flushTotalNanos + "ns, volume=" + getVolumeBaseUri() + + ", blockId=" + replicaInfo.getBlockId()); } } @@ -591,7 +592,8 @@ class BlockReceiver implements Closeable { if (duration > datanodeSlowLogThresholdMs && LOG.isWarnEnabled()) { LOG.warn("Slow BlockReceiver write packet to mirror took " + duration + "ms (threshold=" + datanodeSlowLogThresholdMs + "ms), " - + "downstream DNs=" + Arrays.toString(downstreamDNs)); + + "downstream DNs=" + Arrays.toString(downstreamDNs) + + ", blockId=" + replicaInfo.getBlockId()); } } catch (IOException e) { handleMirrorOutError(e); @@ -725,7 +727,8 @@ class BlockReceiver implements Closeable { if (duration > datanodeSlowLogThresholdMs && LOG.isWarnEnabled()) { LOG.warn("Slow BlockReceiver write data to disk cost:" + duration + "ms (threshold=" + datanodeSlowLogThresholdMs + "ms), " - + "volume=" + getVolumeBaseUri()); + + "volume=" + getVolumeBaseUri() + + ", blockId=" + replicaInfo.getBlockId()); } if (duration > maxWriteToDiskMs) { @@ -917,7 +920,8 @@ class BlockReceiver implements Closeable { if (duration > datanodeSlowLogThresholdMs && LOG.isWarnEnabled()) { LOG.warn("Slow manageWriterOsCache took " + duration + "ms (threshold=" + datanodeSlowLogThresholdMs - + "ms), volume=" + getVolumeBaseUri()); + + "ms), volume=" + getVolumeBaseUri() + + ", blockId=" + replicaInfo.getBlockId()); } } } catch (Throwable t) { @@ -1629,7 +1633,9 @@ class BlockReceiver implements Closeable { if (duration > datanodeSlowLogThresholdMs) { LOG.warn("Slow PacketResponder send ack to upstream took " + duration + "ms (threshold=" + datanodeSlowLogThresholdMs + "ms), " + myString - + ", replyAck=" + replyAck); + + ", replyAck=" + replyAck + + ", downstream DNs=" + Arrays.toString(downstreamDNs) + + ", blockId=" + replicaInfo.getBlockId()); } else if (LOG.isDebugEnabled()) { LOG.debug(myString + ", replyAck=" + replyAck); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
