HDDS-14706. WIP: om finalize no-op

Author: octachoron

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

@@ -281,6 +281,7 @@ public static boolean isReadOnly(OMRequest omRequest) {
     case GetObjectTagging:
     case GetQuotaRepairStatus:
     case StartQuotaRepair:
+    case FinalizeUpgrade:
       return true;
     case CreateVolume:
     case SetVolumeProperty:
@@ -314,7 +315,6 @@ public static boolean isReadOnly(OMRequest omRequest) {
       // As protobuf currently doesn't support deprecating enum fields
       // TODO: Remove once migrated to proto3 and mark fields in proto
       // as deprecated
-    case FinalizeUpgrade:
     case Prepare:
     case CancelPrepare:
     case DeleteOpenKeys:
@@ -396,6 +396,7 @@ public static boolean shouldSendToFollower(OMRequest omRequest) {
     case GetKeyInfo:
     case GetSnapshotInfo:
     case GetObjectTagging:
+    case FinalizeUpgrade:
       return true;
     case CreateVolume:
     case SetVolumeProperty:
@@ -429,7 +430,6 @@ public static boolean shouldSendToFollower(OMRequest omRequest) {
       // As protobuf currently doesn't support deprecating enum fields
       // TODO: Remove once migrated to proto3 and mark fields in proto
       // as deprecated
-    case FinalizeUpgrade:
     case Prepare:
     case CancelPrepare:
     case DeleteOpenKeys:

hadoop-ozone/dist/src/main/smoketest/upgrade/check-finalization.robot

@@ -24,6 +24,7 @@ Test Setup          Run Keyword if    '${SECURITY_ENABLED}' == 'true'    Kinit t
 *** Test Cases ***
 Check OM Finalized
     [Tags]    om    finalized
+    Skip               OM cannot finalize now/yet
     ${result} =        Execute      env
                        Log    ${result}
     Pass Execution If    '%{OZONE_UPGRADE_FROM}' == '1.1.0'    OM finalization not supported in version %{OZONE_UPGRADE_FROM}

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java

@@ -41,6 +41,7 @@
 import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
 import org.apache.hadoop.ozone.om.ratis.OzoneManagerStateMachine;
 import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages;
+import org.apache.ozone.test.tag.Unhealthy;
 import org.apache.ratis.util.LifeCycle;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -50,6 +51,7 @@
  * Tests for OM upgrade finalization.
  * TODO: can be merged into class with other OM tests with per-method cluster
  */
+@Unhealthy("OM cannot finalize now until it can poll the SCM for the trigger")
 class TestOMUpgradeFinalization {
   static {
     AuditLogTestUtils.enableAuditLog();

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java

@@ -51,6 +51,7 @@
 import static org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.DONE;
 import static org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.IN_PROGRESS;
 import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.isDone;
+import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.isFinalized;
 import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.isStarting;
 import static org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer.COLUMN_FAMILIES_TO_TRACK_IN_DAG;
 import static org.apache.ozone.test.LambdaTestUtils.await;
@@ -161,6 +162,7 @@
 import org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer;
 import org.apache.ozone.test.GenericTestUtils;
 import org.apache.ozone.test.tag.Slow;
+import org.apache.ozone.test.tag.Unhealthy;
 import org.apache.ratis.util.function.UncheckedAutoCloseableSupplier;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
@@ -171,6 +173,7 @@
  * Abstract class to test OmSnapshot.
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Unhealthy("no trigger for finalization now/yet, all implementations try finalizing")
 public abstract class TestOmSnapshot {
   static {
     Logger.getLogger(ManagedRocksObjectUtils.class).setLevel(Level.DEBUG);
@@ -332,14 +335,15 @@ private void finalizeOMUpgrade() throws Exception {
         omClient.finalizeUpgrade(upgradeClientID);
 
     // The status should transition as soon as the client call above returns
-    assertTrue(isStarting(finalizationResponse.status()));
+    // assertTrue(isStarting(finalizationResponse.status()));
     // Wait for the finalization to be marked as done.
     // 10s timeout should be plenty.
     await(POLL_MAX_WAIT_MILLIS, POLL_INTERVAL_MILLIS, () -> {
       final UpgradeFinalization.StatusAndMessages progress =
           omClient.queryUpgradeFinalizationProgress(
-              upgradeClientID, false, false);
-      return isDone(progress.status());
+              upgradeClientID, true, false);
+      UpgradeFinalization.Status status = progress.status();
+      return isDone(status) || isFinalized(status);
     });
   }
 

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java

@@ -91,7 +91,6 @@ private static void init() {
     CMD_AUDIT_ACTION_MAP.put(Type.SetBucketProperty, OMAction.UPDATE_BUCKET);
     CMD_AUDIT_ACTION_MAP.put(Type.Prepare, OMAction.UPGRADE_PREPARE);
     CMD_AUDIT_ACTION_MAP.put(Type.CancelPrepare, OMAction.UPGRADE_CANCEL);
-    CMD_AUDIT_ACTION_MAP.put(Type.FinalizeUpgrade, OMAction.UPGRADE_FINALIZE);
     CMD_AUDIT_ACTION_MAP.put(Type.GetObjectTagging, OMAction.GET_OBJECT_TAGGING);
     CMD_AUDIT_ACTION_MAP.put(Type.PutObjectTagging, OMAction.PUT_OBJECT_TAGGING);
     CMD_AUDIT_ACTION_MAP.put(Type.DeleteObjectTagging, OMAction.DELETE_OBJECT_TAGGING);

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/helpers/OMAuditLogger.java

@@ -85,7 +85,6 @@
 import org.apache.hadoop.ozone.om.request.snapshot.OMSnapshotRenameRequest;
 import org.apache.hadoop.ozone.om.request.snapshot.OMSnapshotSetPropertyRequest;
 import org.apache.hadoop.ozone.om.request.upgrade.OMCancelPrepareRequest;
-import org.apache.hadoop.ozone.om.request.upgrade.OMFinalizeUpgradeRequest;
 import org.apache.hadoop.ozone.om.request.upgrade.OMPrepareRequest;
 import org.apache.hadoop.ozone.om.request.util.OMEchoRPCWriteRequest;
 import org.apache.hadoop.ozone.om.request.volume.OMQuotaRepairRequest;
@@ -183,8 +182,6 @@ public static OMClientRequest createClientRequest(OMRequest omRequest,
       return new OMRenewDelegationTokenRequest(omRequest);
     case GetS3Secret:
       return new S3GetSecretRequest(omRequest);
-    case FinalizeUpgrade:
-      return new OMFinalizeUpgradeRequest(omRequest);
     case Prepare:
       return new OMPrepareRequest(omRequest);
     case CancelPrepare: