This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 2b2a7965f4 HDDS-12969. Use DatanodeID in XceiverClientGrpc (#8430)
2b2a7965f4 is described below
commit 2b2a7965f4c3cf8fdc939d153223734b09e3669b
Author: Jimmy_kiet <[email protected]>
AuthorDate: Sun May 11 13:39:00 2025 +0800
HDDS-12969. Use DatanodeID in XceiverClientGrpc (#8430)
---
.../org/apache/hadoop/hdds/scm/XceiverClientGrpc.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
index 394117e0ac..105aa1bf4d 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
@@ -33,7 +33,6 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
@@ -42,6 +41,7 @@
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.protocol.DatanodeID;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
import
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
@@ -88,9 +88,9 @@ public class XceiverClientGrpc extends XceiverClientSpi {
LoggerFactory.getLogger(XceiverClientGrpc.class);
private final Pipeline pipeline;
private final ConfigurationSource config;
- private final Map<UUID, XceiverClientProtocolServiceStub> asyncStubs;
+ private final Map<DatanodeID, XceiverClientProtocolServiceStub> asyncStubs;
private final XceiverClientMetrics metrics;
- private final Map<UUID, ManagedChannel> channels;
+ private final Map<DatanodeID, ManagedChannel> channels;
private final Semaphore semaphore;
private long timeout;
private final SecurityConfig secConfig;
@@ -178,8 +178,8 @@ private synchronized void connectToDatanode(DatanodeDetails
dn)
ManagedChannel channel = createChannel(dn, port).build();
XceiverClientProtocolServiceStub asyncStub =
XceiverClientProtocolServiceGrpc.newStub(channel);
- asyncStubs.put(dn.getUuid(), asyncStub);
- channels.put(dn.getUuid(), channel);
+ asyncStubs.put(dn.getID(), asyncStub);
+ channels.put(dn.getID(), channel);
}
protected NettyChannelBuilder createChannel(DatanodeDetails dn, int port)
@@ -213,7 +213,7 @@ protected NettyChannelBuilder createChannel(DatanodeDetails
dn, int port)
*/
@VisibleForTesting
public boolean isConnected(DatanodeDetails details) {
- return isConnected(channels.get(details.getUuid()));
+ return isConnected(channels.get(details.getID()));
}
private boolean isConnected(ManagedChannel channel) {
@@ -567,7 +567,7 @@ public XceiverClientReply sendCommandAsync(
ContainerCommandRequestProto request, DatanodeDetails dn)
throws IOException, InterruptedException {
checkOpen(dn);
- UUID dnId = dn.getUuid();
+ DatanodeID dnId = dn.getID();
if (LOG.isDebugEnabled()) {
LOG.debug("Send command {} to datanode {}",
request.getCmdType(), dn.getIpAddress());
@@ -625,7 +625,7 @@ private synchronized void checkOpen(DatanodeDetails dn)
throw new IOException("This channel is not connected.");
}
- ManagedChannel channel = channels.get(dn.getUuid());
+ ManagedChannel channel = channels.get(dn.getID());
// If the channel doesn't exist for this specific datanode or the channel
// is closed, just reconnect
if (!isConnected(channel)) {
@@ -639,7 +639,7 @@ private void reconnect(DatanodeDetails dn)
ManagedChannel channel;
try {
connectToDatanode(dn);
- channel = channels.get(dn.getUuid());
+ channel = channels.get(dn.getID());
} catch (Exception e) {
throw new IOException("Error while connecting", e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
