Skip to content

HDDS-11287. Code cleanup in XceiverClientSpi #7043

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 2 commits into from
Aug 7, 2024
Merged

HDDS-11287. Code cleanup in XceiverClientSpi #7043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f963683
HDDS-11287. Code cleanup in XceiverClientSpi
jianghuazhu Aug 7, 2024
3a8d836
Update some code
jianghuazhu Aug 7, 2024
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
9 changes: 3 additions & 6 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 @@ -174,10 +174,9 @@ private synchronized void connectToDatanode(DatanodeDetails dn)
OzoneConfigKeys.HDDS_CONTAINER_IPC_PORT_DEFAULT);
}

// Add credential context to the client call
if (LOG.isDebugEnabled()) {
LOG.debug("Nodes in pipeline : {}", pipeline.getNodes());
LOG.debug("Connecting to server : {}", dn.getIpAddress());
LOG.debug("Connecting to server : {}; nodes in pipeline : {}, ",
dn, pipeline.getNodes());
}
ManagedChannel channel = createChannel(dn, port).build();
XceiverClientProtocolServiceStub asyncStub =
Expand Down Expand Up @@ -320,7 +319,6 @@ public ContainerCommandResponseProto sendCommand(
/**
* @param request
* @param dn
* @param pipeline
* In case of getBlock for EC keys, it is required to set replicaIndex for
* every request with the replicaIndex for that DN for which the request is
* sent to. This method unpacks proto and reconstructs request after setting
Expand All @@ -345,8 +343,7 @@ public ContainerCommandResponseProto sendCommand(
ContainerCommandRequestProto request, List<Validator> validators)
throws IOException {
try {
XceiverClientReply reply;
reply = sendCommandWithTraceIDAndRetry(request, validators);
XceiverClientReply reply = sendCommandWithTraceIDAndRetry(request, validators);
return reply.getResponse().get();
} catch (ExecutionException e) {
throw getIOExceptionForSendCommand(request, e);
Expand Down
6 changes: 2 additions & 4 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ public int getRefcount() {
public ContainerCommandResponseProto sendCommand(
ContainerCommandRequestProto request) throws IOException {
try {
XceiverClientReply reply;
reply = sendCommandAsync(request);
XceiverClientReply reply = sendCommandAsync(request);
return reply.getResponse().get();
} catch (InterruptedException e) {
// Re-interrupt the thread while catching InterruptedException
Expand All @@ -134,8 +133,7 @@ public ContainerCommandResponseProto sendCommand(
List<Validator> validators)
throws IOException {
try {
XceiverClientReply reply;
reply = sendCommandAsync(request);
XceiverClientReply reply = sendCommandAsync(request);
ContainerCommandResponseProto responseProto = reply.getResponse().get();
for (Validator function : validators) {
function.accept(request, responseProto);
Expand Down