This is an automated email from the ASF dual-hosted git repository.
sshenoy 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 c65da9e267 HDDS-9542. Ozone debug chunkinfo command shows incorrect
number of entries. (#5703)
c65da9e267 is described below
commit c65da9e267e61e2d96a3f657c8bb292b1401fdb9
Author: Aryan Gupta <[email protected]>
AuthorDate: Thu Nov 30 16:50:55 2023 +0530
HDDS-9542. Ozone debug chunkinfo command shows incorrect number of entries.
(#5703)
---
.../apache/hadoop/hdds/scm/XceiverClientGrpc.java | 30 ++++++++++++----------
1 file changed, 16 insertions(+), 14 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 32767c77ec..5f8502d194 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
@@ -292,23 +292,25 @@ public class XceiverClientGrpc extends XceiverClientSpi {
Thread.currentThread().interrupt();
}
}
- try {
- for (Map.Entry<DatanodeDetails,
+ for (Map.Entry<DatanodeDetails,
CompletableFuture<ContainerCommandResponseProto> >
entry : futureHashMap.entrySet()) {
+ try {
responseProtoHashMap.put(entry.getKey(), entry.getValue().get());
- }
- } catch (InterruptedException e) {
- LOG.error("Command execution was interrupted.");
- // Re-interrupt the thread while catching InterruptedException
- Thread.currentThread().interrupt();
- } catch (ExecutionException e) {
- String message = "Failed to execute command {}.";
- if (LOG.isDebugEnabled()) {
- LOG.debug(message, processForDebug(request), e);
- } else {
- LOG.error(message + " Exception Class: {}, Exception Message: {}",
- request.getCmdType(), e.getClass().getName(), e.getMessage());
+ } catch (InterruptedException e) {
+ LOG.error("Command execution was interrupted.");
+ // Re-interrupt the thread while catching InterruptedException
+ Thread.currentThread().interrupt();
+ } catch (ExecutionException e) {
+ String message =
+ "Failed to execute command {} on datanode " + entry.getKey()
+ .getHostName();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(message, processForDebug(request), e);
+ } else {
+ LOG.error(message + " Exception Class: {}, Exception Message: {}",
+ request.getCmdType(), e.getClass().getName(), e.getMessage());
+ }
}
}
return responseProtoHashMap;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
