HDDS-14580. Remove OM Prepare for Upgrade Code for ZDU

hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/CancelPrepareSubCommand.java

@@ -27,7 +27,9 @@
  */
 @CommandLine.Command(
     name = "cancelprepare",
-    description = "Cancel prepare state in the OMs.",
+    description = "Deprecated. This command is no longer required, but is kept for backward compatibility with older" +
+        " Ozone Managers.",
+    hidden = true,
     mixinStandardHelpOptions = true,
     versionProvider = HddsVersionProvider.class
 )

hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/PrepareSubCommand.java

@@ -17,18 +17,19 @@
 
 package org.apache.hadoop.ozone.admin.om;
 
-import static org.apache.hadoop.ozone.OmUtils.getOmHostsFromConfig;
 import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PrepareStatusResponse.PrepareStatus.PREPARE_COMPLETED;
 
 import java.io.IOException;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 import org.apache.hadoop.hdds.cli.HddsVersionProvider;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ozone.OmUtils;
+import org.apache.hadoop.ozone.om.helpers.OMNodeDetails;
 import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PrepareStatusResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PrepareStatusResponse.PrepareStatus;
@@ -40,11 +41,9 @@
  */
 @CommandLine.Command(
     name = "prepare",
-    description = "Prepares Ozone Manager for upgrade/downgrade, by applying " +
-        "all pending transactions, taking a Ratis snapshot at the last " +
-        "transaction and purging all logs on each OM instance. The returned " +
-        "transaction #ID corresponds to the last transaction in the quorum in" +
-        " which the snapshot is taken.",
+    description = "Deprecated. This command is no longer required, but is kept for backward compatibility with older" +
+        " Ozone Managers.",
+    hidden = true,
     mixinStandardHelpOptions = true,
     versionProvider = HddsVersionProvider.class
 )
@@ -106,9 +105,11 @@ private void execute(OzoneManagerProtocol client) throws Exception {
         "with Transaction Id : [" + prepareTxnId + "].");
 
     Map<String, Boolean> omPreparedStatusMap = new HashMap<>();
-    Set<String> omHosts = getOmHostsFromConfig(
-        parent.getParent().getOzoneConf(), omServiceOption.getServiceID());
-    omHosts.forEach(h -> omPreparedStatusMap.put(h, false));
+    OzoneConfiguration conf = parent.getParent().getOzoneConf();
+    OmUtils.getAllOMHAAddresses(conf, omServiceOption.getServiceID(), false)
+        .stream()
+        .map(OMNodeDetails::getRpcAddressString)
+        .forEach(addr -> omPreparedStatusMap.put(addr, false));
     Duration pTimeout = Duration.of(prepareTimeOut, ChronoUnit.SECONDS);
     Duration pInterval = Duration.of(prepareCheckInterval, ChronoUnit.SECONDS);
 
@@ -123,10 +124,9 @@ private void execute(OzoneManagerProtocol client) throws Exception {
       for (Map.Entry<String, Boolean> e : omPreparedStatusMap.entrySet()) {
         if (!e.getValue()) {
           String omHost = e.getKey();
-          try (OzoneManagerProtocol singleOmClient =
-                    parent.createOmClient(omServiceOption.getServiceID(), omHost, false)) {
-            PrepareStatusResponse response =
-                singleOmClient.getOzoneManagerPrepareStatus(prepareTxnId);
+          try (OzoneManagerProtocol singleOmClient = parent.createOmClient(omServiceOption.getServiceID(), omHost,
+              false)) {
+            PrepareStatusResponse response = singleOmClient.getOzoneManagerPrepareStatus(prepareTxnId);
             PrepareStatus status = response.getStatus();
             System.out.println("OM : [" + omHost + "], Prepare " +
                 "Status : [" + status.name() + "], Current Transaction Id : [" +

hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java

@@ -263,6 +263,9 @@ public static boolean isReadOnly(OMRequest omRequest) {
       return true;
     case GetQuotaRepairStatus:
     case StartQuotaRepair:
+    // Prepare and CancelPrepare are now no-ops, but still produce responses for compatability.
+    case Prepare:
+    case CancelPrepare:
     case QueryUpgradeStatus:
       return true;
     case CreateVolume:
@@ -299,8 +302,6 @@ public static boolean isReadOnly(OMRequest omRequest) {
       // as deprecated
     case FinalizeUpgrade:
     case StartFinalizeUpgrade:
-    case Prepare:
-    case CancelPrepare:
     case DeleteOpenKeys:
     case SetS3Secret:
     case RevokeS3Secret: