Deleted some leftovers

Author: chiacyu

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/LegacyRatisContainerReplicaCount.java

@@ -223,11 +223,7 @@ private int getAvailableReplicas() {
 
   /**
    * The new replication manager now does not consider replicas with
-   * UNHEALTHY state when counting sufficient replication. This method is
-   * overridden to ensure LegacyReplicationManager works as intended in
-   * HDDS-6447.
-   * See {@link LegacyRatisContainerReplicaCount}, which overrides this
-   * method, for details.
+   * UNHEALTHY state when counting sufficient replication.
    */
   protected int healthyReplicaCountAdapter() {
     return 0;

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java

@@ -441,20 +441,10 @@ private boolean checkContainersReplicatedOnNode(TrackedNode dn)
           continue;
         }
 
-        // If we get here, the container is closed or quasi-closed and all the replicas match that
-        // state, except for any which are unhealthy. As the container is closed, we can check
-        // if it is sufficiently replicated using replicationManager, but this only works if the
-        // legacy RM is not enabled.
-        boolean legacyEnabled = conf.getBoolean("hdds.scm.replication.enable" +
-            ".legacy", false);
-        boolean replicatedOK;
-        if (legacyEnabled) {
-          replicatedOK = replicaSet.isSufficientlyReplicatedForOffline(dn.getDatanodeDetails(), nodeManager);
-        } else {
-          ReplicationManagerReport report = new ReplicationManagerReport();
-          replicationManager.checkContainerStatus(replicaSet.getContainer(), report);
-          replicatedOK = report.getStat(ReplicationManagerReport.HealthState.UNDER_REPLICATED) == 0;
-        }
+        ReplicationManagerReport report = new ReplicationManagerReport();
+        replicationManager.checkContainerStatus(replicaSet.getContainer(), report);
+        boolean replicatedOK = report.getStat(ReplicationManagerReport.HealthState.UNDER_REPLICATED) == 0;
+
         if (replicatedOK) {
           sufficientlyReplicated++;
         } else {

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java

@@ -528,7 +528,6 @@ public void checkIterationResultTimeoutFromReplicationManager(@Nonnull MockedSCM
     CompletableFuture<MoveManager.MoveResult> future2 =
         CompletableFuture.supplyAsync(() -> MoveManager.MoveResult.DELETION_FAIL_TIME_OUT);
 
-    // Try the same test with MoveManager instead of LegacyReplicationManager.
     when(mockedSCM.getMoveManager()
         .move(any(ContainerID.class), any(DatanodeDetails.class), any(DatanodeDetails.class)))
         .thenReturn(future).thenAnswer(invocation -> future2);

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerDatanodeNodeLimit.java

@@ -136,10 +136,6 @@ public void setup(TestInfo testInfo) throws IOException, NodeNotFoundException,
         .thenReturn(CompletableFuture.completedFuture(
             MoveManager.MoveResult.COMPLETED));
 
-    /*
-    Disable LegacyReplicationManager. This means balancer should select RATIS
-     as well as EC containers for balancing. Also, MoveManager will be used.
-     */
     when(replicationManager.getConfig()).thenReturn(rmConf);
     // these configs will usually be specified in each test
     balancerConfiguration =

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java

@@ -30,7 +30,6 @@
 import org.apache.hadoop.hdds.scm.container.ContainerInfo;
 import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException;
 import org.apache.hadoop.hdds.scm.container.ContainerReplica;
-import org.apache.hadoop.hdds.scm.container.replication.LegacyRatisContainerReplicaCount;
 import org.apache.hadoop.hdds.scm.container.replication.RatisContainerReplicaCount;
 import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
 import org.apache.hadoop.hdds.scm.container.SimpleMockNodeManager;
@@ -223,85 +222,6 @@ public void testDecommissionNodeWaitsForContainersToReplicate()
         nodeManager.getNodeStatus(dn1).getOperationalState());
   }
 
-  /**
-   * Situation: A QUASI_CLOSED container has an UNHEALTHY replica with the
-   * greatest BCSID, and three QUASI_CLOSED replicas with a smaller BCSID. The
-   * UNHEALTHY container is on a decommissioning node, and there are no other
-   * copies of this replica, that is, replicas with the same Origin ID as
-   * this replica.
-   *
-   * Expectation: Decommissioning should not complete until the UNHEALTHY
-   * replica has been replicated to another node.
-   *
-   * Note: This test currently uses the LegacyReplicationManager, as the new
-   * one doesn't support this behaviour yet.
-   * @throws NodeNotFoundException
-   * @throws ContainerNotFoundException
-   */
-  @Test
-  public void testDecommissionWaitsForUnhealthyReplicaToReplicate()
-      throws NodeNotFoundException, ContainerNotFoundException {
-    conf.setBoolean("hdds.scm.replication.enable.legacy", true);
-
-    DatanodeDetails dn1 = MockDatanodeDetails.randomDatanodeDetails();
-    nodeManager.register(dn1,
-        new NodeStatus(HddsProtos.NodeOperationalState.DECOMMISSIONING,
-            HddsProtos.NodeState.HEALTHY));
-
-    // create 3 QUASI_CLOSED replicas with containerID 1 and same origin ID
-    ContainerID containerID = ContainerID.valueOf(1);
-    Set<ContainerReplica> replicas =
-        ReplicationTestUtil.createReplicasWithSameOrigin(containerID,
-            State.QUASI_CLOSED, 0, 0, 0);
-
-    // the container's sequence id is greater than the healthy replicas'
-    ContainerInfo container = ReplicationTestUtil.createContainerInfo(
-        RatisReplicationConfig.getInstance(
-            HddsProtos.ReplicationFactor.THREE), containerID.getId(),
-        HddsProtos.LifeCycleState.QUASI_CLOSED,
-        replicas.iterator().next().getSequenceId() + 1);
-    // UNHEALTHY replica is on a unique origin and has same sequence id as
-    // the container
-    ContainerReplica unhealthy =
-        ReplicationTestUtil.createContainerReplica(containerID, 0,
-            dn1.getPersistedOpState(), State.UNHEALTHY,
-            container.getNumberOfKeys(), container.getUsedBytes(), dn1,
-            dn1.getUuid(), container.getSequenceId());
-    replicas.add(unhealthy);
-    nodeManager.setContainers(dn1, ImmutableSet.of(containerID));
-
-    when(repManager.getContainerReplicaCount(eq(containerID)))
-        .thenReturn(new LegacyRatisContainerReplicaCount(container, replicas,
-            0, 0, 3, 2));
-
-    // start monitoring dn1
-    monitor.startMonitoring(dn1);
-    monitor.run();
-    assertEquals(1, monitor.getTrackedNodeCount());
-    assertEquals(HddsProtos.NodeOperationalState.DECOMMISSIONING,
-        nodeManager.getNodeStatus(dn1).getOperationalState());
-
-    // Running the monitor again causes it to remain DECOMMISSIONING
-    // as nothing has changed.
-    monitor.run();
-    assertEquals(HddsProtos.NodeOperationalState.DECOMMISSIONING,
-        nodeManager.getNodeStatus(dn1).getOperationalState());
-
-    // add a copy of the UNHEALTHY replica on a new node, dn1 should get
-    // decommissioned now
-    ContainerReplica copyOfUnhealthyOnNewNode = unhealthy.toBuilder()
-        .setDatanodeDetails(MockDatanodeDetails.randomDatanodeDetails())
-        .build();
-    replicas.add(copyOfUnhealthyOnNewNode);
-    when(repManager.getContainerReplicaCount(eq(containerID)))
-        .thenReturn(new LegacyRatisContainerReplicaCount(container, replicas,
-            0, 0, 3, 2));
-    monitor.run();
-    assertEquals(0, monitor.getTrackedNodeCount());
-    assertEquals(HddsProtos.NodeOperationalState.DECOMMISSIONED,
-        nodeManager.getNodeStatus(dn1).getOperationalState());
-  }
-
   /**
    * Situation: A QUASI_CLOSED container has an UNHEALTHY replica with the
    * greatest BCSID, and three QUASI_CLOSED replicas with a smaller BCSID. The
@@ -440,72 +360,6 @@ public void testDecommissionWaitsForUnhealthyReplicaWithUniqueOriginToReplicateN
         nodeManager.getNodeStatus(dn1).getOperationalState());
   }
 
-  /**
-   * Consider a QUASI_CLOSED container with only UNHEALTHY replicas. If one
-   * of its nodes is decommissioned, the decommissioning should succeed.
-   */
-  @Test
-  public void testQuasiClosedContainerWithAllUnhealthyReplicas()
-      throws NodeNotFoundException, ContainerNotFoundException {
-    conf.setBoolean("hdds.scm.replication.enable.legacy", true);
-
-    DatanodeDetails decommissioningNode =
-        MockDatanodeDetails.randomDatanodeDetails();
-    nodeManager.register(decommissioningNode,
-        new NodeStatus(HddsProtos.NodeOperationalState.DECOMMISSIONING,
-            HddsProtos.NodeState.HEALTHY));
-    ContainerInfo container = ReplicationTestUtil.createContainer(
-        HddsProtos.LifeCycleState.QUASI_CLOSED,
-        RatisReplicationConfig.getInstance(
-            HddsProtos.ReplicationFactor.THREE));
-    Set<ContainerReplica> replicas =
-        ReplicationTestUtil.createReplicas(container.containerID(),
-            State.UNHEALTHY, 0, 0);
-
-    ContainerReplica decommissioningReplica =
-        ReplicationTestUtil.createContainerReplica(container.containerID(), 0,
-            DECOMMISSIONING, State.UNHEALTHY, container.getNumberOfKeys(),
-            container.getUsedBytes(), decommissioningNode,
-            decommissioningNode.getUuid());
-    replicas.add(decommissioningReplica);
-    nodeManager.setContainers(decommissioningNode,
-        ImmutableSet.of(container.containerID()));
-
-    when(repManager.getContainerReplicaCount(
-            eq(container.containerID())))
-        .thenReturn(new LegacyRatisContainerReplicaCount(container, replicas,
-            Collections.emptyList(), 2, true));
-
-    // start monitoring dn1
-    monitor.startMonitoring(decommissioningNode);
-    monitor.run();
-    assertEquals(1, monitor.getTrackedNodeCount());
-    assertEquals(HddsProtos.NodeOperationalState.DECOMMISSIONING,
-        nodeManager.getNodeStatus(decommissioningNode).getOperationalState());
-
-    // Running the monitor again causes it to remain DECOMMISSIONING
-    // as nothing has changed.
-    monitor.run();
-    assertEquals(HddsProtos.NodeOperationalState.DECOMMISSIONING,
-        nodeManager.getNodeStatus(decommissioningNode).getOperationalState());
-
-    // add a copy of the UNHEALTHY replica on a new node, decommissioningNode
-    // should get decommissioned now
-    ContainerReplica copyOfUnhealthyOnNewNode =
-        decommissioningReplica.toBuilder()
-            .setDatanodeDetails(MockDatanodeDetails.randomDatanodeDetails())
-            .build();
-    replicas.add(copyOfUnhealthyOnNewNode);
-    when(repManager.getContainerReplicaCount(
-            eq(container.containerID())))
-        .thenReturn(new LegacyRatisContainerReplicaCount(container, replicas,
-            Collections.emptyList(), 3, true));
-    monitor.run();
-    assertEquals(0, monitor.getTrackedNodeCount());
-    assertEquals(HddsProtos.NodeOperationalState.DECOMMISSIONED,
-        nodeManager.getNodeStatus(decommissioningNode).getOperationalState());
-  }
-
   @Test
   public void testDecommissionNotBlockedByDeletingContainers()
       throws NodeNotFoundException, ContainerNotFoundException {
@@ -840,7 +694,6 @@ public void testCancelledNodesMovedToInService()
   @Test
   public void testContainersReplicatedOnDecomDnAPI()
       throws NodeNotFoundException, ContainerNotFoundException {
-    conf.setBoolean("hdds.scm.replication.enable.legacy", false);
 
     DatanodeDetails dn1 = MockDatanodeDetails.randomDatanodeDetails();
     nodeManager.register(dn1,