You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2024/09/15 02:52:40 UTC
(hbase) branch branch-2.6 updated: HBASE-28775 Change the output of DatanodeInfo in the log to the hostname of the datanode (#6148) (#6212)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 2092ddb87ba HBASE-28775 Change the output of DatanodeInfo in the log to the hostname of the datanode (#6148) (#6212)
2092ddb87ba is described below
commit 2092ddb87ba6d55fbdc4078a6b1c6567d1e53bc6
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sun Sep 15 10:21:13 2024 +0800
HBASE-28775 Change the output of DatanodeInfo in the log to the hostname of the datanode (#6148) (#6212)
Co-authored-by: wangxin <wa...@gmail.com>
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Nihal Jain <ni...@apache.org>
Reviewed-by: Vineet Kumar Maheshwari <vi...@gmail.com>
Reviewed-by: guluo <lu...@qq.com>
(cherry picked from commit 241bbaf0718d6215775cd4996e9ca08ba12eb086)
Co-authored-by: WangXin <14...@qq.com>
(cherry picked from commit f4a1904122312fd2c35b80ed47ed3ee123a3f219)
---
.../asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java | 19 +++++++++++++++++--
.../hadoop/hbase/regionserver/wal/AbstractFSWAL.java | 5 ++++-
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java
index ccd169217f9..6ff200c4ac3 100644
--- a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java
+++ b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java
@@ -35,6 +35,7 @@ import java.io.InterruptedIOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.IdentityHashMap;
@@ -42,6 +43,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.CryptoProtocolVersion;
import org.apache.hadoop.crypto.Encryptor;
@@ -533,8 +535,10 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
Set<DatanodeInfo> toExcludeNodes =
new HashSet<>(excludeDatanodeManager.getExcludeDNs().keySet());
for (int retry = 0;; retry++) {
- LOG.debug("When create output stream for {}, exclude list is {}, retry={}", src,
- toExcludeNodes, retry);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("When create output stream for {}, exclude list is {}, retry={}", src,
+ getDataNodeInfo(toExcludeNodes), retry);
+ }
HdfsFileStatus stat;
try {
stat = FILE_CREATOR.create(namenode, src,
@@ -680,4 +684,15 @@ public final class FanOutOneBlockAsyncDFSOutputHelper {
} catch (InterruptedException e) {
}
}
+
+ public static String getDataNodeInfo(Collection<DatanodeInfo> datanodeInfos) {
+ if (datanodeInfos.isEmpty()) {
+ return "[]";
+ }
+ return datanodeInfos.stream()
+ .map(datanodeInfo -> new StringBuilder().append("(").append(datanodeInfo.getHostName())
+ .append("/").append(datanodeInfo.getInfoAddr()).append(":")
+ .append(datanodeInfo.getInfoPort()).append(")").toString())
+ .collect(Collectors.joining(",", "[", "]"));
+ }
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
index cdeb7e84e06..76e292bd857 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
@@ -56,6 +56,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
import org.apache.commons.lang3.mutable.MutableLong;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
@@ -69,6 +70,7 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.PrivateCellUtil;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.exceptions.TimeoutIOException;
+import org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHelper;
import org.apache.hadoop.hbase.io.util.MemorySizeUtil;
import org.apache.hadoop.hbase.ipc.RpcServer;
import org.apache.hadoop.hbase.ipc.ServerCall;
@@ -921,7 +923,8 @@ public abstract class AbstractFSWAL<W extends WriterBase> implements WAL {
tellListenersAboutPostLogRoll(oldPath, newPath);
if (LOG.isDebugEnabled()) {
LOG.debug("Create new " + implClassName + " writer with pipeline: "
- + Arrays.toString(getPipeline()));
+ + FanOutOneBlockAsyncDFSOutputHelper
+ .getDataNodeInfo(Arrays.stream(getPipeline()).collect(Collectors.toList())));
}
// We got a new writer, so reset the slow sync count
lastTimeCheckSlowSync = EnvironmentEdgeManager.currentTime();