This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 07b67597e8 HDDS-7739. EC: Increase the information in the RM sending
command log message (#4153)
07b67597e8 is described below
commit 07b67597e8f11043e68543a1d888e19a72a612dc
Author: Stephen O'Donnell <[email protected]>
AuthorDate: Mon Jan 9 11:35:22 2023 +0000
HDDS-7739. EC: Increase the information in the RM sending command log
message (#4153)
---
.../apache/hadoop/hdds/protocol/DatanodeDetails.java | 9 +++++++++
.../ozone/protocol/commands/CloseContainerCommand.java | 10 ++++++++++
.../ozone/protocol/commands/DeleteContainerCommand.java | 10 ++++++++++
.../commands/ReconstructECContainersCommand.java | 17 +++++++++++++++++
.../protocol/commands/ReplicateContainerCommand.java | 13 +++++++++++++
.../scm/container/replication/ReplicationManager.java | 4 ++--
6 files changed, 61 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
index 04329ab2b0..ec68692d24 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
@@ -195,6 +195,15 @@ public class DatanodeDetails extends NodeImpl implements
return hostName;
}
+ /**
+ * Returns the Hostname and IP of the datanode separated by a slash.
+ *
+ * Eg: datanode001.corp/192.168.0.123
+ */
+ public String getHostNameAndIP() {
+ return getHostName() + "/" + getIpAddress();
+ }
+
/**
* Sets a DataNode Port.
*
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/CloseContainerCommand.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/CloseContainerCommand.java
index ded0464ef4..edc551688e 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/CloseContainerCommand.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/CloseContainerCommand.java
@@ -79,4 +79,14 @@ public class CloseContainerCommand
public PipelineID getPipelineID() {
return pipelineID;
}
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getType())
+ .append(": containerID: ").append(getContainerID())
+ .append(", pipelineID: ").append(getPipelineID())
+ .append(", force: ").append(force);
+ return sb.toString();
+ }
}
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/DeleteContainerCommand.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/DeleteContainerCommand.java
index bb9035f296..6b76803dbf 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/DeleteContainerCommand.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/DeleteContainerCommand.java
@@ -105,4 +105,14 @@ public class DeleteContainerCommand extends
public int getReplicaIndex() {
return replicaIndex;
}
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getType())
+ .append(": containerID: ").append(getContainerID())
+ .append(", replicaIndex: ").append(getReplicaIndex())
+ .append(", force: ").append(force);
+ return sb.toString();
+ }
}
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReconstructECContainersCommand.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReconstructECContainersCommand.java
index 203e5e6bed..f86fcc7a65 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReconstructECContainersCommand.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReconstructECContainersCommand.java
@@ -134,6 +134,23 @@ public class ReconstructECContainersCommand
return ecReplicationConfig;
}
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getType())
+ .append(": containerID: ").append(containerID)
+ .append(", replicationConfig: ").append(ecReplicationConfig)
+ .append(", sources: [").append(getSources().stream()
+ .map(a -> a.dnDetails.getHostNameAndIP()
+ + " replicaIndex: " + a.getReplicaIndex())
+ .collect(Collectors.joining(", "))).append("]")
+ .append(", targets: [").append(getTargetDatanodes().stream()
+ .map(DatanodeDetails::getHostNameAndIP)
+ .collect(Collectors.joining(", "))).append("]")
+ .append(", missingIndexes: ").append(
+ Arrays.toString(missingContainerIndexes));
+ return sb.toString();
+ }
/**
* To store the datanode details with replica index.
*/
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReplicateContainerCommand.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReplicateContainerCommand.java
index f824557778..cdc2a15e9c 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReplicateContainerCommand.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReplicateContainerCommand.java
@@ -109,4 +109,17 @@ public class ReplicateContainerCommand
public int getReplicaIndex() {
return replicaIndex;
}
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getType());
+ sb.append(": containerId: ").append(getContainerID());
+ sb.append(", replicaIndex: ").append(getReplicaIndex());
+ sb.append(", sourceNodes: [");
+ sb.append(sourceDatanodes.stream()
+ .map(DatanodeDetails::getHostNameAndIP)
+ .collect(Collectors.joining(", "))).append("]");
+ return sb.toString();
+ }
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
index 5fd0ad2ea2..1b5ee43fe3 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
@@ -423,8 +423,8 @@ public class ReplicationManager implements SCMService {
public void sendDatanodeCommand(SCMCommand<?> command,
ContainerInfo containerInfo, DatanodeDetails target)
throws NotLeaderException {
- LOG.info("Sending command of type {} for container {} to {}",
- command.getType(), containerInfo, target);
+ LOG.info("Sending command [{}] for container {} to {}",
+ command, containerInfo, target);
command.setTerm(getScmTerm());
command.setDeadline(clock.millis() +
Math.round(rmConf.eventTimeout * rmConf.commandDeadlineFactor));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
