Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@
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;
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;
Expand Down Expand Up @@ -533,8 +535,10 @@ private static FanOutOneBlockAsyncDFSOutput createOutput(DistributedFileSystem d
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,
Expand Down Expand Up @@ -680,4 +684,15 @@ static void sleepIgnoreInterrupt(int retry) {
} 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(",", "[", "]"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
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;
Expand All @@ -69,6 +70,7 @@
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;
Expand Down Expand Up @@ -921,7 +923,8 @@ private Map<byte[], List<byte[]>> rollWriterInternal(boolean force) throws IOExc
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();
Expand Down