Skip to content

HDDS-13124. Respect config hdds.datanode.use.datanode.hostname when reading from datanode #8518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 1 commit into from
May 28, 2025
Merged

HDDS-13124. Respect config hdds.datanode.use.datanode.hostname when reading from datanode #8518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
Expand Down Expand Up @@ -184,8 +185,13 @@ private synchronized void connectToDatanode(DatanodeDetails dn)

protected NettyChannelBuilder createChannel(DatanodeDetails dn, int port)
throws IOException {
NettyChannelBuilder channelBuilder =
NettyChannelBuilder.forAddress(dn.getIpAddress(), port).usePlaintext()
String dnHost;
if (datanodeUseHostName()) {
dnHost = dn.getHostName();
} else {
dnHost = dn.getIpAddress();
}
NettyChannelBuilder channelBuilder = NettyChannelBuilder.forAddress(dnHost, port)
.maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE)
.proxyDetector(uri -> null)
.intercept(new GrpcClientInterceptor());
Expand All @@ -205,6 +211,12 @@ protected NettyChannelBuilder createChannel(DatanodeDetails dn, int port)
return channelBuilder;
}

private boolean datanodeUseHostName() {
return config.getBoolean(
HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME,
HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT);
}

/**
* Checks if the client has a live connection channel to the specified
* Datanode.
Expand Down Expand Up @@ -570,7 +582,7 @@ public XceiverClientReply sendCommandAsync(
DatanodeID dnId = dn.getID();
if (LOG.isDebugEnabled()) {
LOG.debug("Send command {} to datanode {}",
request.getCmdType(), dn.getIpAddress());
request.getCmdType(), dn);
}
final CompletableFuture<ContainerCommandResponseProto> replyFuture =
new CompletableFuture<>();
Expand Down