You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by he...@apache.org on 2020/07/07 16:03:54 UTC
[hadoop] branch trunk updated: HDFS-15425. Review Logging of
DFSClient. Contributed by Hongbing Wang.
This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4f26454 HDFS-15425. Review Logging of DFSClient. Contributed by Hongbing Wang.
4f26454 is described below
commit 4f26454a7d1b560f959cdb2fb0641147a85642da
Author: He Xiaoqiao <he...@apache.org>
AuthorDate: Tue Jul 7 13:01:46 2020 +0800
HDFS-15425. Review Logging of DFSClient. Contributed by Hongbing Wang.
---
.../src/main/java/org/apache/hadoop/hdfs/DFSClient.java | 9 +++------
.../java/org/apache/hadoop/hdfs/DFSStripedInputStream.java | 12 ++++--------
.../src/main/java/org/apache/hadoop/hdfs/StripeReader.java | 6 ++----
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
index 72b2113..5a6a0f6 100755
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
@@ -332,12 +332,9 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
MIN_REPLICATION,
HdfsClientConfigKeys.BlockWrite.ReplaceDatanodeOnFailure.
MIN_REPLICATION_DEFAULT);
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "Sets " + HdfsClientConfigKeys.BlockWrite.ReplaceDatanodeOnFailure.
- MIN_REPLICATION + " to "
- + dtpReplaceDatanodeOnFailureReplication);
- }
+ LOG.debug("Sets {} to {}",
+ HdfsClientConfigKeys.BlockWrite.ReplaceDatanodeOnFailure.
+ MIN_REPLICATION, dtpReplaceDatanodeOnFailureReplication);
this.ugi = UserGroupInformation.getCurrentUser();
this.namenodeUri = nameNodeUri;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java
index ba35d51..fa1cf34 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java
@@ -110,9 +110,7 @@ public class DFSStripedInputStream extends DFSInputStream {
dataBlkNum, parityBlkNum);
decoder = CodecUtil.createRawDecoder(dfsClient.getConfiguration(),
ecPolicy.getCodecName(), coderOptions);
- if (DFSClient.LOG.isDebugEnabled()) {
- DFSClient.LOG.debug("Creating an striped input stream for file " + src);
- }
+ DFSClient.LOG.debug("Creating an striped input stream for file {}", src);
}
private boolean useDirectBuffer() {
@@ -465,10 +463,8 @@ public class DFSStripedInputStream extends DFSInputStream {
break;
}
}
- if (DFSClient.LOG.isDebugEnabled()) {
- DFSClient.LOG.debug("refreshLocatedBlock for striped blocks, offset="
- + block.getStartOffset() + ". Obtained block " + lb + ", idx=" + idx);
- }
+ DFSClient.LOG.debug("refreshLocatedBlock for striped blocks, offset={}." +
+ " Obtained block {}, idx={}", block.getStartOffset(), lb, idx);
return StripedBlockUtil.constructInternalBlock(
lsb, i, cellSize, dataBlkNum, idx);
}
@@ -526,7 +522,7 @@ public class DFSStripedInputStream extends DFSInputStream {
if (!warnedNodes.containsAll(dnUUIDs)) {
DFSClient.LOG.warn(Arrays.toString(nodes) + " are unavailable and " +
"all striping blocks on them are lost. " +
- "IgnoredNodes = " + ignoredNodes);
+ "IgnoredNodes = {}", ignoredNodes);
warnedNodes.addAll(dnUUIDs);
}
} else {
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java
index 8fd38bd..96cbb73 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java
@@ -353,10 +353,8 @@ abstract class StripeReader {
StripingChunkReadResult r = StripedBlockUtil
.getNextCompletedStripedRead(service, futures, 0);
dfsStripedInputStream.updateReadStats(r.getReadStats());
- if (DFSClient.LOG.isDebugEnabled()) {
- DFSClient.LOG.debug("Read task returned: " + r + ", for stripe "
- + alignedStripe);
- }
+ DFSClient.LOG.debug("Read task returned: {}, for stripe {}",
+ r, alignedStripe);
StripingChunk returnedChunk = alignedStripe.chunks[r.index];
Preconditions.checkNotNull(returnedChunk);
Preconditions.checkState(returnedChunk.state == StripingChunk.PENDING);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org