You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by so...@apache.org on 2022/10/03 09:05:54 UTC
[ozone] branch master updated: HDDS-7268. EC: Fix tests for HealthCheck handlers of RM that use Replica Indexes for Ratis Containers (#3793)
This is an automated email from the ASF dual-hosted git repository.
sodonnell 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 8dbbb4eb5f HDDS-7268. EC: Fix tests for HealthCheck handlers of RM that use Replica Indexes for Ratis Containers (#3793)
8dbbb4eb5f is described below
commit 8dbbb4eb5f933c94bec51752d00c731211ce42d0
Author: Siddhant Sangwan <si...@gmail.com>
AuthorDate: Mon Oct 3 14:35:47 2022 +0530
HDDS-7268. EC: Fix tests for HealthCheck handlers of RM that use Replica Indexes for Ratis Containers (#3793)
---
.../health/TestClosedWithMismatchedReplicasHandler.java | 8 ++++----
.../replication/health/TestClosingContainerHandler.java | 10 +++++-----
.../container/replication/health/TestOpenContainerHandler.java | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosedWithMismatchedReplicasHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosedWithMismatchedReplicasHandler.java
index 222f34c6ef..ff2faa0ebc 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosedWithMismatchedReplicasHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosedWithMismatchedReplicasHandler.java
@@ -162,7 +162,7 @@ public class TestClosedWithMismatchedReplicasHandler {
ratisReplicationConfig, 1, CLOSED);
Set<ContainerReplica> containerReplicas =
ReplicationTestUtil.createReplicas(containerInfo.containerID(),
- ContainerReplicaProto.State.CLOSED, 1, 2, 3);
+ ContainerReplicaProto.State.CLOSED, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
.setPendingOps(Collections.EMPTY_LIST)
.setReport(new ReplicationManagerReport())
@@ -181,15 +181,15 @@ public class TestClosedWithMismatchedReplicasHandler {
ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo(
ratisReplicationConfig, 1, CLOSED);
ContainerReplica mismatch1 = ReplicationTestUtil.createContainerReplica(
- containerInfo.containerID(), 1,
+ containerInfo.containerID(), 0,
HddsProtos.NodeOperationalState.IN_SERVICE,
ContainerReplicaProto.State.OPEN);
ContainerReplica mismatch2 = ReplicationTestUtil.createContainerReplica(
- containerInfo.containerID(), 2,
+ containerInfo.containerID(), 0,
HddsProtos.NodeOperationalState.IN_SERVICE,
ContainerReplicaProto.State.CLOSING);
ContainerReplica mismatch3 = ReplicationTestUtil.createContainerReplica(
- containerInfo.containerID(), 3,
+ containerInfo.containerID(), 0,
HddsProtos.NodeOperationalState.IN_SERVICE,
ContainerReplicaProto.State.UNHEALTHY);
Set<ContainerReplica> containerReplicas = new HashSet<>();
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosingContainerHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosingContainerHandler.java
index b45ec89513..2999884e1d 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosingContainerHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestClosingContainerHandler.java
@@ -87,7 +87,7 @@ public class TestClosingContainerHandler {
ratisReplicationConfig, 1, CLOSED);
Set<ContainerReplica> containerReplicas = ReplicationTestUtil
.createReplicas(containerInfo.containerID(),
- ContainerReplicaProto.State.CLOSING, 1, 2, 3);
+ ContainerReplicaProto.State.CLOSING, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
.setPendingOps(Collections.EMPTY_LIST)
@@ -133,9 +133,9 @@ public class TestClosingContainerHandler {
ratisReplicationConfig, 1, CLOSING);
Set<ContainerReplica> containerReplicas = ReplicationTestUtil
.createReplicas(containerInfo.containerID(),
- ContainerReplicaProto.State.UNHEALTHY, 1, 2);
+ ContainerReplicaProto.State.UNHEALTHY, 0, 0);
ContainerReplica openReplica = ReplicationTestUtil.createContainerReplica(
- containerInfo.containerID(), 3,
+ containerInfo.containerID(), 0,
HddsProtos.NodeOperationalState.IN_SERVICE,
ContainerReplicaProto.State.OPEN);
containerReplicas.add(openReplica);
@@ -181,9 +181,9 @@ public class TestClosingContainerHandler {
ratisReplicationConfig, 1, CLOSING);
Set<ContainerReplica> containerReplicas = ReplicationTestUtil
.createReplicas(containerInfo.containerID(),
- ContainerReplicaProto.State.CLOSING, 1, 2);
+ ContainerReplicaProto.State.CLOSING, 0, 0);
containerReplicas.add(ReplicationTestUtil.createContainerReplica(
- containerInfo.containerID(), 3,
+ containerInfo.containerID(), 0,
HddsProtos.NodeOperationalState.IN_SERVICE,
ContainerReplicaProto.State.OPEN));
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestOpenContainerHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestOpenContainerHandler.java
index 1f2ca96d91..5eae9ff045 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestOpenContainerHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestOpenContainerHandler.java
@@ -118,7 +118,7 @@ public class TestOpenContainerHandler {
ratisReplicationConfig, 1, CLOSED);
Set<ContainerReplica> containerReplicas = ReplicationTestUtil
.createReplicas(containerInfo.containerID(),
- ContainerReplicaProto.State.CLOSED, 1, 2, 3);
+ ContainerReplicaProto.State.CLOSED, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
.setPendingOps(Collections.EMPTY_LIST)
.setReport(new ReplicationManagerReport())
@@ -136,7 +136,7 @@ public class TestOpenContainerHandler {
ratisReplicationConfig, 1, OPEN);
Set<ContainerReplica> containerReplicas = ReplicationTestUtil
.createReplicas(containerInfo.containerID(),
- ContainerReplicaProto.State.OPEN, 1, 2, 3);
+ ContainerReplicaProto.State.OPEN, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
.setPendingOps(Collections.EMPTY_LIST)
.setReport(new ReplicationManagerReport())
@@ -154,7 +154,7 @@ public class TestOpenContainerHandler {
ratisReplicationConfig, 1, OPEN);
Set<ContainerReplica> containerReplicas = ReplicationTestUtil
.createReplicas(containerInfo.containerID(),
- ContainerReplicaProto.State.CLOSED, 1, 2, 3);
+ ContainerReplicaProto.State.CLOSED, 0, 0, 0);
ContainerCheckRequest request = new ContainerCheckRequest.Builder()
.setPendingOps(Collections.EMPTY_LIST)
.setReport(new ReplicationManagerReport())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org