This is an automated email from the ASF dual-hosted git repository.
umamahesh pushed a commit to branch HDDS-3816-ec
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-3816-ec by this push:
new 29c69b1 HDDS-6272: EC: Recon UI failing because of EC replication
factor (#3067)
29c69b1 is described below
commit 29c69b109ba36ea7b0b396ef2701ff76675ea9e4
Author: Uma Maheswara Rao G <[email protected]>
AuthorDate: Wed Feb 9 12:45:54 2022 -0800
HDDS-6272: EC: Recon UI failing because of EC replication factor (#3067)
Co-authored-by: Uma Maheswara Rao G <[email protected]>
---
.../apache/hadoop/ozone/recon/api/NodeEndpoint.java | 11 +++--------
.../hadoop/ozone/recon/api/types/DatanodePipeline.java | 18 +++++++++---------
.../apache/hadoop/ozone/recon/api/TestEndpoints.java | 3 ++-
3 files changed, 14 insertions(+), 18 deletions(-)
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/NodeEndpoint.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/NodeEndpoint.java
index 4e6ee3a..d4b126f 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/NodeEndpoint.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/NodeEndpoint.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.recon.api;
-import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState;
@@ -105,13 +104,9 @@ public class NodeEndpoint {
try {
Pipeline pipeline = pipelineManager.getPipeline(pipelineID);
String leaderNode = pipeline.getLeaderNode().getHostName();
- DatanodePipeline datanodePipeline = new DatanodePipeline(
- pipelineID.getId(),
- pipeline.getReplicationConfig().getReplicationType().toString(),
-
ReplicationConfig.getLegacyFactor(pipeline.getReplicationConfig())
- .getNumber(),
- leaderNode
- );
+ DatanodePipeline datanodePipeline =
+ new DatanodePipeline(pipelineID.getId(),
+ pipeline.getReplicationConfig(), leaderNode);
pipelines.add(datanodePipeline);
if (datanode.getUuid().equals(pipeline.getLeaderId())) {
leaderCount.getAndIncrement();
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/DatanodePipeline.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/DatanodePipeline.java
index cc38cd5..88a2989 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/DatanodePipeline.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/DatanodePipeline.java
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.ozone.recon.api.types;
+import org.apache.hadoop.hdds.client.ReplicationConfig;
+
import java.util.UUID;
/**
@@ -24,15 +26,13 @@ import java.util.UUID;
*/
public class DatanodePipeline {
private UUID pipelineID;
- private String replicationType;
- private int replicationFactor;
+ private ReplicationConfig repConfig;
private String leaderNode;
- public DatanodePipeline(UUID pipelineID, String replicationType,
- int replicationFactor, String leaderNode) {
+ public DatanodePipeline(UUID pipelineID, ReplicationConfig repConfig,
+ String leaderNode) {
this.pipelineID = pipelineID;
- this.replicationType = replicationType;
- this.replicationFactor = replicationFactor;
+ this.repConfig = repConfig;
this.leaderNode = leaderNode;
}
@@ -41,11 +41,11 @@ public class DatanodePipeline {
}
public String getReplicationType() {
- return replicationType;
+ return repConfig.getReplicationType().name();
}
- public int getReplicationFactor() {
- return replicationFactor;
+ public ReplicationConfig getReplicationConfig() {
+ return repConfig;
}
public String getLeaderNode() {
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
index 43df965..80fd59f 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
@@ -415,7 +415,8 @@ public class TestEndpoints extends AbstractReconSqlDBTest {
Assert.assertEquals(pipelineId,
datanodeMetadata.getPipelines().get(0).getPipelineID().toString());
Assert.assertEquals(pipeline.getReplicationConfig().getRequiredNodes(),
- datanodeMetadata.getPipelines().get(0).getReplicationFactor());
+ datanodeMetadata.getPipelines().get(0).getReplicationConfig()
+ .getRequiredNodes());
Assert.assertEquals(pipeline.getType().toString(),
datanodeMetadata.getPipelines().get(0).getReplicationType());
Assert.assertEquals(pipeline.getLeaderNode().getHostName(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
