HDDS-1368. Cleanup old ReplicationManager code from SCM.

Author: nandakumar131

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/StateContext.java

@@ -19,9 +19,10 @@
 import com.google.common.base.Preconditions;
 import com.google.protobuf.GeneratedMessage;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdds.protocol.proto
+    .StorageContainerDatanodeProtocolProtos.SCMCommandProto;
 import org.apache.hadoop.hdds.protocol.proto
     .StorageContainerDatanodeProtocolProtos.PipelineAction;
 import org.apache.hadoop.hdds.protocol.proto
@@ -34,8 +35,6 @@
 import org.apache.hadoop.ozone.container.common.states.datanode
     .RunningDatanodeState;
 import org.apache.hadoop.ozone.protocol.commands.CommandStatus;
-import org.apache.hadoop.ozone.protocol.commands.CommandStatus
-    .CommandStatusBuilder;
 import org.apache.hadoop.ozone.protocol.commands
     .DeleteBlockCommandStatus.DeleteBlockCommandStatusBuilder;
 import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
@@ -432,27 +431,14 @@ public void addCmdStatus(Long key, CommandStatus status) {
    * @param cmd - {@link SCMCommand}.
    */
   public void addCmdStatus(SCMCommand cmd) {
-    final Optional<CommandStatusBuilder> cmdStatusBuilder;
-    switch (cmd.getType()) {
-    case replicateContainerCommand:
-      cmdStatusBuilder = Optional.of(CommandStatusBuilder.newBuilder());
-      break;
-    case deleteBlocksCommand:
-      cmdStatusBuilder = Optional.of(
-          DeleteBlockCommandStatusBuilder.newBuilder());
-      break;
-    case deleteContainerCommand:
-      cmdStatusBuilder = Optional.of(CommandStatusBuilder.newBuilder());
-      break;
-    default:
-      cmdStatusBuilder = Optional.empty();
+    if (cmd.getType() == SCMCommandProto.Type.deleteBlocksCommand) {
+      addCmdStatus(cmd.getId(),
+          DeleteBlockCommandStatusBuilder.newBuilder()
+              .setCmdId(cmd.getId())
+              .setStatus(Status.PENDING)
+              .setType(cmd.getType())
+              .build());
     }
-    cmdStatusBuilder.ifPresent(statusBuilder ->
-        addCmdStatus(cmd.getId(), statusBuilder
-            .setCmdId(cmd.getId())
-            .setStatus(Status.PENDING)
-            .setType(cmd.getType())
-            .build()));
   }
 
   /**

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteContainerCommandHandler.java

@@ -56,11 +56,7 @@ public void handle(final SCMCommand command,
       final ContainerController controller = ozoneContainer.getController();
       controller.deleteContainer(deleteContainerCommand.getContainerID(),
           deleteContainerCommand.isForce());
-      updateCommandStatus(context, command,
-          (cmdStatus) -> cmdStatus.setStatus(true), LOG);
     } catch (IOException e) {
-      updateCommandStatus(context, command,
-          (cmdStatus) -> cmdStatus.setStatus(false), LOG);
       LOG.error("Exception occurred while deleting the container.", e);
     } finally {
       totalTime += Time.monotonicNow() - startTime;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ReplicateContainerCommandHandler.java

@@ -61,25 +61,17 @@ public ReplicateContainerCommandHandler(
   public void handle(SCMCommand command, OzoneContainer container,
       StateContext context, SCMConnectionManager connectionManager) {
 
-    ReplicateContainerCommand replicateCommand =
+    final ReplicateContainerCommand replicateCommand =
         (ReplicateContainerCommand) command;
-    try {
-      List<DatanodeDetails> sourceDatanodes =
-          replicateCommand.getSourceDatanodes();
-      long containerID = replicateCommand.getContainerID();
-
-      Preconditions.checkArgument(sourceDatanodes.size() > 0,
-          String.format("Replication command is received for container %d "
-              + "but the size of source datanodes was 0.", containerID));
-
-      ReplicationTask replicationTask =
-          new ReplicationTask(containerID, sourceDatanodes);
-      supervisor.addTask(replicationTask);
-
-    } finally {
-      updateCommandStatus(context, command,
-          (cmdStatus) -> cmdStatus.setStatus(true), LOG);
-    }
+    final List<DatanodeDetails> sourceDatanodes =
+        replicateCommand.getSourceDatanodes();
+    final long containerID = replicateCommand.getContainerID();
+
+    Preconditions.checkArgument(sourceDatanodes.size() > 0,
+        String.format("Replication command is received for container %d "
+            + "but the size of source datanodes was 0.", containerID));
+
+    supervisor.addTask(new ReplicationTask(containerID, sourceDatanodes));
   }
 
   @Override

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/command/CommandStatusReportHandler.java

@@ -18,9 +18,10 @@
 package org.apache.hadoop.hdds.scm.command;
 
 import com.google.common.base.Preconditions;
+import org.apache.hadoop.hdds.protocol.proto
+    .StorageContainerDatanodeProtocolProtos.SCMCommandProto;
 import org.apache.hadoop.hdds.protocol.proto
     .StorageContainerDatanodeProtocolProtos.CommandStatus;
-import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
 import org.apache.hadoop.hdds.scm.events.SCMEvents;
 import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher
     .CommandStatusReportFromDatanode;
@@ -54,32 +55,14 @@ public void onMessage(CommandStatusReportFromDatanode report,
     cmdStatusList.forEach(cmdStatus -> {
       LOGGER.trace("Emitting command status for id:{} type: {}", cmdStatus
           .getCmdId(), cmdStatus.getType());
-      switch (cmdStatus.getType()) {
-      case replicateContainerCommand:
-        publisher.fireEvent(SCMEvents.REPLICATION_STATUS, new
-            ReplicationStatus(cmdStatus));
-        if (cmdStatus.getStatus() == CommandStatus.Status.EXECUTED) {
-          publisher.fireEvent(SCMEvents.REPLICATION_COMPLETE,
-              new ReplicationManager.ReplicationCompleted(
-                  cmdStatus.getCmdId()));
-        }
-        break;
-      case deleteBlocksCommand:
+      if (cmdStatus.getType() == SCMCommandProto.Type.deleteBlocksCommand) {
         if (cmdStatus.getStatus() == CommandStatus.Status.EXECUTED) {
           publisher.fireEvent(SCMEvents.DELETE_BLOCK_STATUS,
               new DeleteBlockStatus(cmdStatus));
         }
-        break;
-      case deleteContainerCommand:
-        if (cmdStatus.getStatus() == CommandStatus.Status.EXECUTED) {
-          publisher.fireEvent(SCMEvents.DELETE_CONTAINER_COMMAND_COMPLETE,
-              new ReplicationManager.DeleteContainerCommandCompleted(
-                  cmdStatus.getCmdId()));
-        }
-      default:
+      } else {
         LOGGER.debug("CommandStatus of type:{} not handled in " +
             "CommandStatusReportHandler.", cmdStatus.getType());
-        break;
       }
     });
   }
@@ -109,24 +92,6 @@ public long getId() {
     }
   }
 
-  /**
-   * Wrapper event for Replicate Command.
-   */
-  public static class ReplicationStatus extends CommandStatusEvent {
-    public ReplicationStatus(CommandStatus cmdStatus) {
-      super(cmdStatus);
-    }
-  }
-
-  /**
-   * Wrapper event for CloseContainer Command.
-   */
-  public static class CloseContainerStatus extends CommandStatusEvent {
-    public CloseContainerStatus(CommandStatus cmdStatus) {
-      super(cmdStatus);
-    }
-  }
-
   /**
    * Wrapper event for DeleteBlock Command.
    */