This is an automated email from the ASF dual-hosted git repository.

errose28 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


    from 78784ba9fac HDDS-15071. [SCM] Add configuration and global EC 
reconstruction limit (#11054)
     add bb546a28374 HDDS-14646. SCM should not close Ratis pipelines on 
Finalize (#9779)
     add 90ad60d52bf HDDS-14712. Rename DatanodeVersion to HDDSVersion (#9822)
     add c74df5f4129 HDDS-14723. Create one common interface for LayoutFeature 
and ComponentVersion (#9832)
     add d04a5e57e06 HDDS-14729. Address followup items in HDDS-14646 (#9838)
     add 97e127333f4 HDDS-14735. ComponentVersions should not be compared using 
int values. (#9841)
     add c920cd4376c HDDS-14671. Remove healthy_readonly state from SCM (#9836)
     add 020f8aa7b1b HDDS-14570. SCM should finalize all versions with one 
Ratis request (#9715)
     add c9fe669c994 HDDS-14672. Remove SCM finalization checkpoints (#9955)
     add 50f407e2f61 HDDS-14732. Create a new VersionManager for unified 
component versioning (#9897)
     add 19b856eee49 HDDS-14905. Followups from HDDS-14672 (#9983)
     add 4e66d82c9a3 HDDS-14751. Add basic ZDU flow in acceptance tests (#9877)
     add 6c4d8525425 HDDS-14940. Create skeleton for ozone admin upgrade status 
command (#10011)
     add fca46ecd302 HDDS-14897. Add multiple S3 gateways to the 
rolling-upgrade suite (#10028)
     add db2219f4981 HDDS-15034. Query SCM status for ozone admin upgrade 
status command (#10084)
     add f639c57a07b HDDS-14896. Use separate container for clients in 
rolling-upgrade suite (#10032)
     add 798853709f1 HDDS-14826. Prepare OM to switch from LayoutVersionManager 
to ComponentVersionManager (#10098)
     add cbc79b59c7b HDDS-15126. Remove unused TestHDDSUpgrade (#10148)
     add 70cbe94b32f HDDS-15063. Switch OM to the new Versioning Framework 
(#10099)
     add 4ab7a96b0b3 HDDS-14669. Implement a new async finalize command which 
does not block on the server (#10152)
     add 98d066f5cbe Merge branch 'master' into merge-master
     add 0b1024f790c Additional changes on top of merge commit to fix compile 
issues
     add 6c254b51def HDDS-15197. Remove unnecessary BelongsToLayoutVersion 
annotations. (#10205)
     add 0373ab252c8 HDDS-14670. SCM queryFinalizeStatus shouldFinalize should 
only be true when out of safemode (#10193)
     add 524b2370493 HDDS-15196. Split HDDS upgrade actions into specific SCM 
and Datanode actions. (#10206)
     add cb71a0a3fb6 HDDS-14821. Version specific data validation in 
rolling-upgrade suite (#10033)
     add 1818dd2cb5f HDDS-15263. Downgrade should happen in reverse order 
(#10269)
     add e1e15cb3e60 HDDS-15195. Switch Datanode to the new versioning 
framework (#10215)
     add fb96f08c9ab HDDS-15375. Renames to prepare to switch SCM to the new 
versioning framework. (#10366)
     add eba78b6c4a8 HDDS-15208. OM should learn to finalize from SCM after 
finalization command (#10236)
     add f2a996cd6f6 HDDS-15376. Implement new ScmVersionManager. (#10367)
     add 0bd403261f9 HDDS-15483. More renames missed in HDDS-15375 (#10436)
     add a66822e64fc HDDS-15377. Switch SCM to use new ScmVersionManager 
(#10368)
     add 032821150a6 HDDS-15379. Remove unused classes from the old upgrade 
framework (#10370)
     add 97b60475a4c HDDS-15386. Remove LayoutFeature interface (#10376)
     add 04d44dedcaa HDDS-15484. Decouple ComponentVersionManager from Storage 
(#10437)
     add 5361f6e0d1e HDDS-15374. Switch Recon to the new versioning framework 
(#10443)
     add cff07d54867 HDDS-15482. Add fencing based on datanode versions to SCM 
and Recon (#10504)
     add 353b7cc67cd HDDS-15488. Recon upgrade actions should be idempotent 
(#10442)
     add 22948f4d15d HDDS-15528. Adjust upgrade finalize command to call OM 
instread of SCM (#10493)
     add 21bc0e6ec2a HDDS-15609. Legacy SCM Finalize command should become a 
no-op (#10543)
     add f49a2e0d84a HDDS-15622. New finalize command should check OM server 
version (#10548)
     add ece9fdf7fdc HDDS-15639. Adjust Upgrade status command to call OM 
intead of SCM (#10579)
     add b556be18dc4 Merge branch 'master' into HDDS-14496-zdu
     add 44fce2c2506 HDDS-15677. Update client side version checks to use 
`isSupportedBy`. (#10611)
     add dc1fd833496 HDDS-14825. Add Grafana Dashboard and Metrics for ZDU 
(#10602)
     add 98c55fe4905 HDDS-15848. Add new upgrade action annotations for 
component versions (#10744)
     add e16d646d29b Merge branch 'master' into HDDS-14496-zdu-master-3
     add 21d05128d28 HDDS-14580. Remove OM Prepare for Upgrade Code for ZDU 
(#9723)
     add 2f149e45a92 HDDS-14687. Add test that OM can finalize from a snapshot 
(#10832)
     add ab6bd667a38 HDDS-15715. Add helpful CLI flags to finalization CLIs 
(#10678)
     add 21b69d28856 HDDS-15716. Replace layout version protos with new 
version-named protos in the DN–SCM protocol (#10817)
     add ad1c396df42 HDDS-15417. Handle mixed datanode versions on the 
replication path (#10570)
     add 53f472a7c04 HDDS-15875. OM should validate software versions of peers 
before accepting finalize command (#10777)
     add 04204aa31bf HDDS-16023. Create OM request versioning annotations 
compatible with new versioning framework (#10903)
     add 13019333036 HDDS-14754. Add ZDU upgrade action to clean up leftover 
state (#10889)
     add 4cd5c364dfb HDDS-16024. Make OM and SCM proto finalization status an 
enum (#10902)
     add 03b462c681a HDDS-15641. SCM should send write pipeline version with 
DatanodeDetails on block allocation (#10878)
     add b5c52d34c82 HDDS-15885. SCM should validate software versions of peers 
before accepting finalize command (#10783)
     add d782c841917 HDDS-14753. Do not prematurely serialize client version 
(#10936)
     add 37874d15574 HDDS-15549. Recon's INITIAL_VERSION should not have an 
upgrade action (#10935)
     add 19635689a53 HDDS-16153. DatanodeDetails should use HDDSVersion instead 
of int (#10994)
     add 79728a163a3 HDDS-16154. Datanode should assign 
DatanodeDetails#currentVersion based on its apparent version (#11006)
     add 25495e1a9f5 HDDS-16190. Do not use unified version framework in OM 
until ZDU is finalized. (#11025)
     add 71a27e3fc1f Merge branch 'master' into HDDS-14496-zdu
     add c46d5edf657 HDDS-16025. Allow old clients to start finalization on a 
new server. (#11074)
     add 4443f642315 HDDS-16044. SCM should forward Datanode's current version 
to clients for read and write operations (#11023)
     add f535d5dabec HDDS-16020. Configure upgrade acceptance tests to run on 
master (#11039)
     add 72ced386d61 HDDS-16312. SCM needs to choose apparent version for 
reconcile and reconstruct container commands (#11148)
     add 81fd3c45d01 HDDS-16356. SCM finalize API should only be reachable by 
OM (#11177)
     add 44b89fdac5c HDDS-15718. Pass write pipeline version from client to 
Datanode on write (#10991)
     add 6659199c307 HDDS-15966. Fix flaky 
TestScmHAFinalization#testSnapshotFinalization (#11200)
     add 2f259232bd9 HDDS-16399. Fix flaky 
testFinalizationEmptyClusterDataDistribution (#11228)
     add 3bb8eedde39 HDDS-16500. Test stabilization fixes for the ZDU branch 
(#11258)
     add 77e82c6182d HDDS-16639. `ozone admin upgrade status` should have an 
admin check (#11354)
     add c064bafb5e1 Merge branch 'master' into HDDS-14496-zdu
     add a9a64dbed31 Merge branch 'master' into HDDS-14496-zdu
     add 4ef88e7b2ac Merge branch 'master' into HDDS-14496-zdu
     add 1e528b97aed Merge branch 'HDDS-14496-zdu'

No new revisions were added by this update.

Summary of changes:
 .../apache/hadoop/hdds/scm/XceiverClientGrpc.java  |    6 +-
 .../hadoop/hdds/scm/XceiverClientManager.java      |    5 +-
 .../hdds/scm/storage/BlockDataStreamOutput.java    |    3 +-
 .../hadoop/hdds/scm/storage/BlockOutputStream.java |    6 +-
 .../client/io/BlockInputStreamFactoryImpl.java     |    4 +-
 .../storage/TestBlockOutputStreamCorrectness.java  |    2 +-
 .../org/apache/hadoop/hdds/ComponentVersion.java   |   77 +-
 .../{DatanodeVersion.java => HDDSVersion.java}     |   57 +-
 .../hadoop/hdds/protocol/DatanodeDetails.java      |   99 +-
 .../hdds/ratis/ContainerCommandRequestMessage.java |    2 +-
 .../common/helpers/ContainerWithPipeline.java      |   13 +-
 .../org/apache/hadoop/hdds/scm/net/InnerNode.java  |    3 +-
 .../java/org/apache/hadoop/hdds/scm/net/Node.java  |    3 +-
 .../apache/hadoop/hdds/scm/pipeline/Pipeline.java  |   52 +-
 .../hdds/scm/storage/ContainerProtocolCalls.java   |   12 +-
 .../hadoop/hdds/scm/utils/ClientCommandsUtils.java |   43 +
 .../hdds/upgrade/BelongsToHDDSLayoutVersion.java   |   33 -
 .../org/apache/hadoop/ozone/ClientVersion.java     |   37 +-
 .../java/org/apache/hadoop/ozone/OzoneConsts.java  |   19 +-
 .../apache/hadoop/ozone/OzoneManagerVersion.java   |   53 +-
 .../java/org/apache/hadoop/ozone/Versioned.java    |   25 -
 ...re.java => ComponentUpgradeActionProvider.java} |   41 +-
 .../hadoop/ozone/upgrade/UpgradeAction.java}       |   13 +-
 .../hadoop/ozone/upgrade/UpgradeException.java     |    8 +-
 .../hadoop/ozone/upgrade/UpgradeFinalization.java  |    9 +-
 .../common/src/main/resources/ozone-default.xml    |    7 +-
 .../hadoop/hdds/AbstractComponentVersionTest.java  |  151 +++
 .../hadoop/hdds/ComponentVersionTestUtils.java     |   51 +
 .../org/apache/hadoop/hdds/TestClientVersion.java} |   32 +-
 .../hdds/TestComponentVersionInvariants.java       |   95 --
 .../org/apache/hadoop/hdds/TestHDDSVersion.java    |   63 ++
 .../hadoop/hdds/TestOzoneManagerVersion.java       |   64 ++
 .../hadoop/hdds/protocol/MockDatanodeDetails.java  |    4 +-
 .../hadoop/hdds/protocol/TestDatanodeDetails.java  |   28 +-
 .../ratis/TestContainerCommandRequestMessage.java  |    4 +-
 .../balancer/TestContainerBalancerAdvisor.java     |    2 +-
 .../TestContainerBalancerClusterAnalyzer.java      |    4 +-
 .../hadoop/hdds/scm/pipeline/TestPipeline.java     |   88 +-
 .../scm/storage/TestContainerProtocolCalls.java    |  186 ++++
 .../hdds/scm/utils/TestClientCommandsUtils.java    |   77 ++
 .../ozone/container/ContainerTestHelper.java       |    2 +-
 .../hdds/upgrade/DatanodeUpgradeAction.java}       |    8 +-
 .../upgrade/DatanodeUpgradeActionProvider.java     |   48 +
 .../apache/hadoop/hdds/upgrade/package-info.java   |    2 +-
 .../apache/hadoop/ozone/HddsDatanodeService.java   |   21 +-
 ...nodeLayoutStorage.java => DatanodeStorage.java} |   26 +-
 .../container/common/helpers/DatanodeIdYaml.java   |   56 +-
 .../common/statemachine/DatanodeStateMachine.java  |   52 +-
 ...ler.java => FinalizeVersionCommandHandler.java} |   59 +-
 .../states/datanode/RunningDatanodeState.java      |    2 -
 .../states/endpoint/HeartbeatEndpointTask.java     |  116 +-
 .../states/endpoint/RegisterEndpointTask.java      |   88 +-
 .../server/ratis/ContainerStateMachine.java        |    4 +
 .../transport/server/ratis/DispatcherContext.java  |   26 +
 .../transport/server/ratis/XceiverServerRatis.java |    7 +-
 .../diskbalancer/DiskBalancerProtocolServer.java   |    3 +-
 .../ECReconstructionCommandInfo.java               |   13 +
 .../ozone/container/keyvalue/KeyValueHandler.java  |    9 +-
 .../ozone/container/ozoneimpl/OzoneContainer.java  |    6 +-
 .../container/replication/ReplicationTask.java     |   12 +
 .../ContainerTableSchemaFinalizeAction.java        |    9 +-
 .../upgrade/DataNodeUpgradeFinalizer.java          |   94 --
 .../upgrade/DatanodeSchemaV2FinalizeAction.java    |    9 +-
 .../upgrade/DatanodeSchemaV3FinalizeAction.java    |    9 +-
 .../container/upgrade/DatanodeVersionManager.java  |   96 ++
 .../ScmHAFinalizeUpgradeActionDatanode.java        |    9 +-
 .../ozone/container/upgrade/UpgradeUtils.java      |   25 +-
 .../upgrade/VersionedDatanodeFeatures.java         |   64 +-
 .../protocol/StorageContainerDatanodeProtocol.java |    6 +-
 .../protocol/StorageContainerNodeProtocol.java     |    6 +-
 ...ionCommand.java => FinalizeVersionCommand.java} |   46 +-
 .../commands/ReconcileContainerCommand.java        |   39 +-
 .../commands/ReconstructECContainersCommand.java   |   39 +-
 .../commands/ReplicateContainerCommand.java        |   30 +-
 ...inerDatanodeProtocolClientSideTranslatorPB.java |   10 +-
 ...inerDatanodeProtocolServerSideTranslatorPB.java |   18 +-
 .../DatanodeUpgradeActionForLayoutFeature.java}    |   17 +-
 .../upgrade/DatanodeUpgradeActionForVersion.java   |   11 +-
 .../apache/hadoop/ozone/upgrade}/package-info.java |    4 +-
 .../ozone/container/common/ContainerTestUtils.java |   17 +-
 .../hadoop/ozone/container/common/ScmTestMock.java |    4 +-
 .../container/common/TestDatanodeStateMachine.java |    4 +-
 .../common/helpers/TestContainerUtils.java         |   23 +-
 .../common/helpers/TestDatanodeIdYaml.java         |   18 +-
 .../common/statemachine/TestStateContext.java      |   10 +-
 .../TestFinalizeVersionCommandHandler.java         |   91 ++
 .../TestReplicateContainerCommandHandler.java      |   49 +-
 .../states/endpoint/TestHeartbeatEndpointTask.java |  138 ++-
 .../TestHeartbeatEndpointTaskDnsRefresh.java       |   21 +-
 .../server/ratis/TestDispatcherContext.java        |   38 +-
 .../container/keyvalue/TestKeyValueHandler.java    |   84 ++
 .../impl/TestKeyValueStreamDataChannel.java        |    2 +-
 .../ReplicationSupervisorSchedulingBenchmark.java  |    4 +-
 .../replication/TestGrpcReplicationService.java    |    5 +-
 .../replication/TestMeasuredReplicator.java        |   20 +-
 .../container/replication/TestPushReplicator.java  |    8 +-
 .../replication/TestReplicationSupervisor.java     |   11 +-
 ...TestDatanodeStartupInvalidApparentVersion.java} |   64 +-
 .../TestDatanodeUpgradeToContainerIdsTable.java    |   12 +-
 .../upgrade/TestDatanodeUpgradeToHBaseSupport.java |   12 +-
 .../upgrade/TestDatanodeUpgradeToSchemaV3.java     |   64 +-
 .../upgrade/TestDatanodeVersionManager.java        |  251 +++++
 .../ozone/container/upgrade/UpgradeTestHelper.java |   22 +-
 .../upgrade/ZduDatanodeUpgradeActionForTest.java}  |   18 +-
 .../commands/TestReconcileContainerCommand.java    |   88 ++
 .../TestReconstructECContainersCommand.java        |   98 ++
 .../commands/TestReplicateContainerCommand.java    |  100 ++
 .../docs/content/design/upgrade-dev-primer.md      |   16 +-
 .../hadoop/hdds/protocol/DiskBalancerProtocol.java |    2 +-
 .../apache/hadoop/hdds/scm/client/ScmClient.java   |    2 +
 .../container/common/helpers/MoveDataNodePair.java |    4 +-
 .../apache/hadoop/hdds/scm/net/InnerNodeImpl.java  |    3 +-
 .../scm/protocol/ScmBlockLocationProtocol.java     |   24 +
 .../protocol/StorageContainerLocationProtocol.java |   24 +-
 ...lockLocationProtocolClientSideTranslatorPB.java |   36 +-
 ...inerLocationProtocolClientSideTranslatorPB.java |   26 +-
 .../hadoop/hdds/server/http/BaseHttpServer.java    |    2 +
 .../hadoop/hdds/server/http/BuildInfoMetrics.java  |  101 ++
 .../hadoop/hdds/upgrade/HDDSLayoutFeature.java     |   83 +-
 .../hdds/upgrade/HDDSLayoutVersionManager.java     |  102 --
 .../hadoop/hdds/upgrade/HDDSVersionUtils.java      |   71 ++
 .../java/org/apache/hadoop/hdds/utils/HAUtils.java |    7 +-
 .../org/apache/hadoop/ozone/common/Storage.java    |   19 +-
 .../apache/hadoop/ozone/common/StorageInfo.java    |   25 +-
 .../upgrade/AbstractLayoutVersionManager.java      |  228 ----
 .../upgrade/AbstractUpgradeActionProvider.java     |  103 ++
 .../ozone/upgrade/BasicUpgradeFinalizer.java       |  343 ------
 .../ozone/upgrade/ComponentVersionManager.java     |  194 ++++
 .../upgrade/ComponentVersionManagerMetrics.java    |   76 ++
 .../DefaultUpgradeFinalizationExecutor.java        |   73 --
 .../hadoop/ozone/upgrade/LayoutVersionManager.java |   83 --
 .../ozone/upgrade/RatisBasedVersionManager.java    |   67 ++
 .../ozone/upgrade/UpgradeFinalizationExecutor.java |   32 -
 .../hadoop/ozone/upgrade/UpgradeFinalizer.java     |   99 --
 .../hdds/server/http/TestBuildInfoMetrics.java     |  117 ++
 .../hadoop/hdds/upgrade/TestHDDSLayoutFeature.java |  109 ++
 .../hdds/upgrade/TestHDDSLayoutVersionManager.java |   95 --
 .../hadoop/hdds/upgrade/test/MockComponent.java    |   63 --
 .../hadoop/ozone/audit/AuditLogTestUtils.java      |   26 +-
 .../AbstractComponentVersionManagerTest.java       |  147 +++
 .../InjectedUpgradeFinalizationExecutor.java       |  124 ---
 .../upgrade/TestAbstractLayoutVersionManager.java  |  210 ----
 .../upgrade/TestAbstractUpgradeActionProvider.java |   75 ++
 .../ozone/upgrade/TestBasicUpgradeFinalizer.java   |  235 ----
 .../TestDefaultUpgradeFinalizationExecutor.java    |   89 --
 .../ozone/upgrade/TestUpgradeFinalizerActions.java |  109 --
 .../hadoop/ozone/upgrade/UpgradeTestUtils.java     |   59 -
 .../src/main/proto/ScmAdminProtocol.proto          |   14 +
 .../src/main/proto/DatanodeClientProtocol.proto    |    3 +
 .../interface-client/src/main/proto/hdds.proto     |   20 +-
 .../proto/ScmServerDatanodeHeartbeatProtocol.proto |   37 +-
 .../src/main/proto/ScmServerProtocol.proto         |   20 +
 .../ReconcileContainerEventHandler.java            |   25 +-
 .../container/replication/ReplicationManager.java  |   40 +-
 .../apache/hadoop/hdds/scm/events/SCMEvents.java   |   12 +-
 .../org/apache/hadoop/hdds/scm/ha/SCMContext.java  |   32 -
 .../apache/hadoop/hdds/scm/ha/SCMStateMachine.java |    1 -
 .../invoker/FinalizationStateManagerInvoker.java   |   80 +-
 .../apache/hadoop/hdds/scm/node/DatanodeInfo.java  |   62 +-
 .../hadoop/hdds/scm/node/DatanodeUsageInfo.java    |    5 +-
 .../hdds/scm/node/HealthyReadOnlyNodeHandler.java  |   97 --
 .../apache/hadoop/hdds/scm/node/NodeManager.java   |  192 +++-
 .../hadoop/hdds/scm/node/NodeStateManager.java     |  222 +---
 .../apache/hadoop/hdds/scm/node/NodeStatus.java    |   13 +-
 .../hadoop/hdds/scm/node/SCMNodeManager.java       |  240 +++--
 ...ler.java => UnhealthyToHealthyNodeHandler.java} |   22 +-
 .../hadoop/hdds/scm/pipeline/PipelineManager.java  |   12 -
 .../hdds/scm/pipeline/PipelineManagerImpl.java     |   41 +-
 ...lockLocationProtocolServerSideTranslatorPB.java |   87 +-
 ...inerLocationProtocolServerSideTranslatorPB.java |   88 +-
 .../scm/safemode/HealthyPipelineSafeModeRule.java  |   14 +-
 .../hdds/scm/safemode/SafeModeRuleFactory.java     |    3 +-
 .../hdds/scm/server/SCMBlockProtocolServer.java    |  146 +++
 .../hdds/scm/server/SCMClientProtocolServer.java   |   65 +-
 .../hadoop/hdds/scm/server/SCMConfigurator.java    |   22 -
 .../scm/server/SCMDatanodeHeartbeatDispatcher.java |   30 +-
 .../hdds/scm/server/SCMDatanodeProtocolServer.java |   18 +-
 .../hadoop/hdds/scm/server/SCMStorageConfig.java   |   10 +-
 .../hdds/scm/server/StorageContainerManager.java   |   72 +-
 .../ClearFinalizingStateScmUpgradeAction.java      |   48 +
 .../scm/server/upgrade/FinalizationCheckpoint.java |   87 --
 .../scm/server/upgrade/FinalizationManager.java    |   39 +-
 .../server/upgrade/FinalizationManagerImpl.java    |  170 +--
 .../server/upgrade/FinalizationStateManager.java   |   21 +-
 .../upgrade/FinalizationStateManagerImpl.java      |  257 +----
 .../upgrade/SCMUpgradeFinalizationContext.java     |  142 ---
 .../scm/server/upgrade/SCMUpgradeFinalizer.java    |  205 ----
 .../ScmOnFinalizeActionForDatanodeSchemaV2.java    |   16 +-
 .../hdds/scm/server/upgrade/ScmVersionManager.java |  131 +++
 .../hadoop/hdds/upgrade/ScmUpgradeAction.java}     |    8 +-
 .../hdds/upgrade/ScmUpgradeActionProvider.java     |   47 +
 .../apache/hadoop/hdds/upgrade/package-info.java   |    2 +-
 .../org/apache/hadoop/ozone/audit/SCMAction.java   |    1 +
 .../upgrade/ScmUpgradeActionForLayoutFeature.java} |   17 +-
 .../ozone/upgrade/ScmUpgradeActionForVersion.java  |    9 +-
 .../apache/hadoop/ozone/upgrade}/package-info.java |    4 +-
 .../hadoop/hdds/scm/container/MockNodeManager.java |   20 +-
 .../hdds/scm/container/SimpleMockNodeManager.java  |   12 +-
 .../TestIncrementalContainerReportHandler.java     |    8 +-
 .../TestContainerBalancerDatanodeNodeLimit.java    |    2 +-
 .../algorithms/TestContainerPlacementFactory.java  |    2 +-
 .../TestSCMContainerPlacementCapacity.java         |    2 +-
 .../TestSCMContainerPlacementRackAware.java        |    8 +-
 .../TestSCMContainerPlacementRackScatter.java      |    4 +-
 .../TestSCMContainerPlacementRandom.java           |    4 +-
 .../TestReconcileContainerEventHandler.java        |   41 +-
 .../container/replication/ReplicationTestUtil.java |    5 +-
 .../TestContainerReplicaPendingOps.java            |    4 +-
 .../replication/TestReplicationManager.java        |  184 +++-
 .../TestReplicationManagerScenarios.java           |   10 +
 .../replication/TestReplicationManagerUtil.java    |   10 +-
 .../hadoop/hdds/scm/ha/TestSCMStateMachine.java    |   65 +-
 .../scm/ha/invoker/ScmInvokerCodeGenerator.java    |   14 +-
 .../hadoop/hdds/scm/node/TestCommandQueue.java     |    9 +-
 .../hdds/scm/node/TestContainerPlacement.java      |   11 +-
 .../hdds/scm/node/TestDatanodeUsageInfo.java       |    4 +-
 .../hadoop/hdds/scm/node/TestDeadNodeHandler.java  |    6 +-
 .../hdds/scm/node/TestNodeReportHandler.java       |    8 +-
 .../hadoop/hdds/scm/node/TestNodeStateManager.java |  115 +-
 .../hdds/scm/node/TestPendingContainerTracker.java |   16 +-
 .../hadoop/hdds/scm/node/TestSCMNodeManager.java   |  707 ++++++------
 .../hadoop/hdds/scm/node/TestSCMNodeMetrics.java   |   13 +-
 .../hdds/scm/node/states/TestNodeStateMap.java     |    4 +-
 .../hdds/scm/pipeline/MockPipelineManager.java     |   19 +-
 .../scm/pipeline/TestCreateForReadComparator.java  |   13 -
 .../TestPipelineDatanodesIntersection.java         |    2 +-
 .../hdds/scm/pipeline/TestPipelineManagerImpl.java |    7 +-
 .../scm/pipeline/TestPipelinePlacementFactory.java |    2 +-
 .../scm/pipeline/TestPipelinePlacementPolicy.java  |    6 +-
 .../scm/pipeline/TestPipelineStateManagerImpl.java |   40 +-
 .../scm/pipeline/TestRatisPipelineProvider.java    |   16 +-
 .../scm/pipeline/TestSimplePipelineProvider.java   |    4 +-
 ...lockLocationProtocolServerSideTranslatorPB.java |  293 +++++
 ...inerLocationProtocolServerSideTranslatorPB.java |  224 ++++
 .../scm/server/TestSCMBlockProtocolServer.java     |  271 ++++-
 .../scm/server/TestSCMClientProtocolServer.java    |   84 +-
 .../server/TestSCMDatanodeHeartbeatDispatcher.java |   27 +
 .../TestClearFinalizingStateScmUpgradeAction.java  |   83 ++
 .../scm/server/upgrade/TestScmVersionManager.java  |  248 +++++
 .../scm/upgrade/FinalizationManagerTestImpl.java   |   52 -
 .../hdds/scm/upgrade/ScmUpgradeTestUtils.java      |   56 +
 .../hdds/scm/upgrade/TestScmFinalization.java      |  415 --------
 ...a => TestScmStartupInvalidApparentVersion.java} |   66 +-
 .../ozone/container/common/TestEndPoint.java       |   76 +-
 .../hdds/scm/cli/ContainerOperationClient.java     |    8 +-
 .../hdds/scm/cli/datanode/BasicDatanodeInfo.java   |    2 +-
 .../ozone/admin/om/CancelPrepareSubCommand.java    |    4 +-
 .../admin/om/FinalizationStatusSubCommand.java     |    7 +-
 .../ozone/admin/om/FinalizeUpgradeSubCommand.java  |    7 +-
 .../ozone/admin/om/ListOpenFilesSubCommand.java    |    2 +-
 .../hadoop/ozone/admin/om/PrepareSubCommand.java   |   23 +-
 .../admin/scm/FinalizationScmStatusSubcommand.java |    8 +-
 .../admin/scm/FinalizeScmUpgradeSubcommand.java    |    8 +-
 .../ozone/admin/upgrade/FinalizeSubCommand.java    |  140 +++
 .../ozone/admin/upgrade/StatusSubCommand.java      |  176 +++
 .../admin/upgrade/UpgradeCommands.java}            |   20 +-
 .../hadoop/ozone/admin/upgrade}/package-info.java  |    4 +-
 .../TestContainerBalancerAssessmentSubcommand.java |    2 +-
 .../scm/cli/TestContainerBalancerSubCommand.java   |    4 +-
 .../scm/cli/datanode/TestListInfoSubcommand.java   |   19 +-
 .../admin/upgrade/TestFinalizeSubCommand.java      |  352 ++++++
 .../ozone/admin/upgrade/TestStatusSubCommand.java  |  288 +++++
 .../apache/hadoop/ozone/debug/VersionDebug.java    |    8 +-
 .../apache/hadoop/ozone/fsck/ContainerMapper.java  |    2 +-
 .../ozone/debug/om/TestContainerToKeyMapping.java  |    5 +-
 .../schemaupgrade/UpgradeContainerSchema.java      |   35 +-
 .../datanode/schemaupgrade/UpgradeUtils.java       |   26 -
 .../schemaupgrade/TestUpgradeContainerSchema.java  |    6 +-
 .../hadoop/ozone/client/io/KeyOutputStream.java    |    2 +-
 .../apache/hadoop/ozone/client/rpc/RpcClient.java  |   80 +-
 .../hadoop/ozone/client/rpc/TestRpcClient.java     |  168 ++-
 .../main/java/org/apache/hadoop/ozone/OmUtils.java |   12 +-
 .../org/apache/hadoop/ozone/om/OMConfigKeys.java   |    4 +
 .../hadoop/ozone/om/exceptions/OMException.java    |    7 +
 .../ozone/om/ha/OMFailoverProxyProviderBase.java   |    1 +
 .../ozone/om/helpers/KeyInfoWithVolumeContext.java |    3 +-
 .../apache/hadoop/ozone/om/helpers/OmKeyInfo.java  |   16 +-
 .../hadoop/ozone/om/helpers/OmKeyLocationInfo.java |    5 +-
 .../ozone/om/helpers/OmKeyLocationInfoGroup.java   |    3 +-
 .../ozone/om/helpers/OmMultipartPartInfo.java      |    2 +-
 .../hadoop/ozone/om/helpers/OzoneFileStatus.java   |    3 +-
 .../hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java |    6 +-
 .../hadoop/ozone/om/helpers/ServiceInfo.java       |    4 +-
 .../hadoop/ozone/om/protocol/OMAdminProtocol.java  |    8 +
 .../ozone/om/protocol/OzoneManagerProtocol.java    |   41 +
 .../protocolPB/OMAdminProtocolClientSideImpl.java  |   14 +
 ...OzoneManagerProtocolClientSideTranslatorPB.java |   43 +-
 .../request/validation/RegisterValidator.java      |    4 +-
 .../ozone/request/validation/package-info.java     |    2 +-
 ...doopRpcOMFollowerReadFailoverProxyProvider.java |    4 +-
 .../hadoop/ozone/om/helpers/TestOmKeyInfo.java     |    6 +-
 .../ozone/om/protocolPB/TestS3GrpcOmTransport.java |   28 +-
 .../dashboards/Ozone - Overall Metrics.json        |    7 +-
 .../dashboards/Ozone - Rolling Upgrade.json        | 1124 ++++++++++++++++++++
 .../dist/src/main/compose/common/init-kdc.sh       |    2 +
 .../dist/src/main/compose/common/s3-haproxy.cfg    |   17 +-
 .../dist/src/main/compose/common/security.conf     |    4 +-
 .../dist/src/main/compose/ozone-om-prepare/.env    |   25 -
 .../compose/ozone-om-prepare/docker-compose.yaml   |  126 ---
 .../main/compose/ozone-om-prepare/docker-config    |   37 -
 .../dist/src/main/compose/ozone-om-prepare/test.sh |   62 --
 hadoop-ozone/dist/src/main/compose/testlib.sh      |   10 +-
 .../dist/src/main/compose/upgrade/README.md        |    3 +-
 .../compose/upgrade/compose/ha/docker-compose.yaml |   73 +-
 .../src/main/compose/upgrade/compose/ha/load.sh    |    3 +-
 hadoop-ozone/dist/src/main/compose/upgrade/test.sh |    5 +
 .../dist/src/main/compose/upgrade/testlib.sh       |   26 +-
 .../callbacks/1.3.0/callback.sh                    |    2 +-
 .../callbacks/1.4.0/callback.sh                    |    4 +-
 .../callbacks/2.0.0/callback.sh                    |    4 +-
 .../callbacks/common/callback.sh                   |   56 +-
 .../upgrade/upgrades/non-rolling-upgrade/driver.sh |    8 +-
 .../rolling-upgrade/callbacks/common/callback.sh   |   76 ++
 .../upgrade/upgrades/rolling-upgrade/driver.sh     |  182 ++++
 .../main/smoketest/omha/om-cancel-prepare.robot    |   44 -
 .../dist/src/main/smoketest/omha/om-prepare.robot  |   51 -
 .../dist/src/main/smoketest/omha/om-prepared.robot |   37 -
 .../{ => non-rolling}/check-finalization.robot     |    2 +-
 .../upgrade/{ => non-rolling}/finalize.robot       |    2 +-
 .../smoketest/upgrade/{ => non-rolling}/lib.robot  |    6 +-
 .../upgrade/{ => non-rolling}/prepare.robot        |    6 +-
 .../check-finalization.robot}                      |   17 +-
 .../smoketest/upgrade/{ => rolling}/finalize.robot |   16 +-
 .../AbstractTestStorageDistributionEndpoint.java   |    4 +-
 .../apache/hadoop/fs/ozone/TestHSyncUpgrade.java   |   30 +-
 .../hadoop/hdds/scm/TestContainerOperations.java   |    3 +-
 .../hdds/scm/TestSCMDatanodeProtocolServer.java    |    4 +-
 .../container/TestScmApplyTransactionFailure.java  |    4 +-
 .../scm/node/TestDecommissionAndMaintenance.java   |    2 -
 .../hadoop/hdds/upgrade/HddsUpgradeTestUtils.java  |  236 ++--
 .../TestDNDataDistributionFinalization.java        |   69 +-
 .../hadoop/hdds/upgrade/TestHDDSUpgrade.java       |  911 ----------------
 .../TestScmDataDistributionFinalization.java       |  122 +--
 .../hadoop/hdds/upgrade/TestScmHAFinalization.java |  307 ++----
 .../apache/hadoop/ozone/TestMiniOzoneCluster.java  |    8 +-
 .../client/rpc/TestBlockDataStreamOutput.java      |   13 +-
 .../rpc/TestDatanodeCurrentVersionEndToEnd.java    |  244 +++++
 .../ozone/client/rpc/TestSecureOzoneRpcClient.java |    4 +-
 .../commandhandler/TestFinalizeBlock.java          |    3 +-
 .../replication/TestContainerReplication.java      |   11 +-
 .../replication/TestPerVolumePushReplication.java  |    7 +-
 .../org/apache/hadoop/ozone/debug/TestLDBCli.java  |    2 +-
 .../TestContainerCommandReconciliation.java        |    8 +-
 .../apache/hadoop/ozone/om/OMUpgradeTestUtils.java |   57 +-
 .../ozone/om/TestBucketLayoutWithOlderClient.java  |    2 +-
 .../hadoop/ozone/om/TestOMBucketLayoutUpgrade.java |   27 +-
 .../ozone/om/TestOMRatisSnapshotTransfer.java      |    9 +-
 .../hadoop/ozone/om/TestOMUpgradeFinalization.java |  292 +++--
 ...va => TestOmStartupInvalidApparentVersion.java} |   54 +-
 ...stOzoneManagerHAFollowerReadWithAllRunning.java |    4 +-
 .../ozone/om/TestOzoneManagerHAWithAllRunning.java |    2 +-
 .../hadoop/ozone/om/TestOzoneManagerPrepare.java   |  529 ---------
 .../om/TestUpgradeFinalizationWithOldClients.java  |  158 +++
 .../om/multitenant/TestMultiTenantVolume.java      |   34 +-
 .../ozone/om/service/TestBlockDeletionService.java |   39 +-
 .../hadoop/ozone/om/snapshot/OmSnapshotTests.java  |   24 +-
 .../hadoop/ozone/shell/TestOzoneShellHA.java       |   51 +
 .../src/test/resources/auditlog.properties         |   30 +-
 .../src/main/proto/OMAdminProtocol.proto           |   14 +
 .../src/main/proto/OmClientProtocol.proto          |  121 ++-
 .../apache/hadoop/ozone/MiniOzoneClusterImpl.java  |    8 +-
 .../hadoop/ozone/UniformDatanodesFactory.java      |   47 +-
 .../org/apache/hadoop/ozone/audit/OMAction.java    |    2 -
 .../java/org/apache/hadoop/ozone/om/OMMetrics.java |   10 +
 .../apache/hadoop/ozone/om/OMStarterInterface.java |    3 -
 .../java/org/apache/hadoop/ozone/om/OMStorage.java |    8 +-
 .../hadoop/ozone/om/OmMetadataManagerImpl.java     |    2 +-
 .../org/apache/hadoop/ozone/om/OzoneManager.java   |  288 ++---
 .../hadoop/ozone/om/OzoneManagerPrepareState.java  |  310 ------
 .../hadoop/ozone/om/OzoneManagerStarter.java       |   23 +-
 .../hadoop/ozone/om/TrashOzoneFileSystem.java      |    2 +-
 .../hadoop/ozone/om/helpers/OMAuditLogger.java     |    2 -
 .../ozone/om/ratis/OzoneManagerRatisServer.java    |   25 +-
 .../ozone/om/ratis/OzoneManagerStateMachine.java   |   50 -
 .../om/ratis/utils/OzoneManagerRatisUtils.java     |   16 +-
 .../hadoop/ozone/om/request/OMClientRequest.java   |    6 +-
 .../om/request/bucket/OMBucketCreateRequest.java   |    4 +-
 .../ozone/om/request/file/OMFileCreateRequest.java |    7 +-
 .../request/file/OMFileCreateRequestWithFSO.java   |    3 +-
 .../om/request/file/OMRecoverLeaseRequest.java     |    6 +-
 .../om/request/key/OMAllocateBlockRequest.java     |    4 +-
 .../ozone/om/request/key/OMKeyCreateRequest.java   |    6 +-
 .../om/request/key/OMKeyCreateRequestWithFSO.java  |    3 +-
 .../S3MultipartUploadCommitPartRequest.java        |    4 +-
 .../S3MultipartUploadCompleteRequest.java          |    4 +-
 .../snapshot/OMSnapshotMoveDeletedKeysRequest.java |    5 +
 .../snapshot/OMSnapshotMoveTableKeysRequest.java   |    2 +-
 .../om/request/upgrade/OMCancelPrepareRequest.java |  102 --
 ....java => OMCompleteFinalizeUpgradeRequest.java} |   73 +-
 .../upgrade/OMFinalizeUpgradeRequestBase.java      |  179 ++++
 .../ozone/om/request/upgrade/OMPrepareRequest.java |  273 -----
 .../OMStartFinalizeUpgradeRequest.java}            |   33 +-
 .../OMStartFinalizeUpgradeRequestLegacy.java       |   56 +
 .../validation/OMClientVersionValidator.java       |    2 +-
 .../validation/OMLayoutVersionValidator.java       |    2 +-
 .../om/request/validation/ValidationCondition.java |    2 +-
 .../om/request/validation/ValidationContext.java   |   18 +-
 .../om/request/validation/VersionExtractor.java    |   16 +-
 .../response/upgrade/OMCancelPrepareResponse.java  |   42 -
 ...java => OMCompleteFinalizeUpgradeResponse.java} |   28 +-
 .../om/response/upgrade/OMPrepareResponse.java     |   55 -
 ...se.java => OMStartFinalizeUpgradeResponse.java} |   36 +-
 .../ozone/om/service/DirectoryDeletingService.java |    4 +-
 .../ozone/om/service/KeyDeletingService.java       |    2 +-
 .../ozone/om/service/KeyLifecycleService.java      |   10 +-
 .../ozone/om/service/OpenKeyCleanupService.java    |    2 +-
 .../om/service/RevokedSTSTokenCleanupService.java  |    2 +-
 .../ozone/om/service/SnapshotDeletingService.java  |    4 +-
 .../om/snapshot/OmSnapshotLocalDataManager.java    |   10 +-
 .../RequireSnapshotFeatureStateAspect.java         |    2 +-
 .../upgrade/ClearPreparedStateOmUpgradeAction.java |   60 ++
 ...tVersion.java => DisallowedUntilOmVersion.java} |   15 +-
 .../hadoop/ozone/om/upgrade/OMLayoutFeature.java   |   65 +-
 .../ozone/om/upgrade/OMLayoutVersionManager.java   |  149 ---
 ...tureAspect.java => OMRequestVersionAspect.java} |   98 +-
 .../ozone/om/upgrade/OMUpgradeActionProvider.java  |   48 +
 .../ozone/om/upgrade/OMUpgradeFinalizeService.java |  151 +++
 .../ozone/om/upgrade/OMUpgradeFinalizer.java       |   42 -
 .../hadoop/ozone/om/upgrade/OMVersionManager.java  |  126 +++
 .../hadoop/ozone/om/upgrade/OmUpgradeAction.java   |    2 +-
 ...m.java => OmUpgradeActionForLayoutFeature.java} |    2 +-
 ...Version.java => OmUpgradeActionForVersion.java} |    9 +-
 .../ozone/om/upgrade/QuotaRepairUpgradeAction.java |    2 +-
 .../protocolPB/OMAdminProtocolServerSideImpl.java  |   11 +
 .../protocolPB/OzoneManagerRequestHandler.java     |   85 +-
 .../src/main/resources/META-INF/aop.xml            |    2 +-
 .../ozone/om/ScmBlockLocationTestingClient.java    |   14 +
 .../org/apache/hadoop/ozone/om/TestOMStorage.java  |    4 +-
 .../ozone/om/TestOzoneManagerHttpServer.java       |   16 +-
 .../hadoop/ozone/om/TestOzoneManagerStarter.java   |   23 -
 .../om/ratis/TestOzoneManagerRatisRequest.java     |   29 +
 .../om/ratis/TestOzoneManagerStateMachine.java     |   80 --
 .../ozone/om/request/OMRequestTestUtils.java       |    7 +-
 .../request/TestOMClientRequestWithUserInfo.java   |    7 +-
 .../om/request/bucket/BucketRequestTests.java      |    8 +-
 .../request/file/TestOMDirectoryCreateRequest.java |   10 +-
 .../file/TestOMDirectoryCreateRequestWithFSO.java  |   10 +-
 .../om/request/file/TestOMRecoverLeaseRequest.java |    2 +-
 .../ozone/om/request/key/OMKeyRequestTests.java    |   13 +-
 .../key/TestOMDirectoriesPurgeApplyPerf.java       |    4 +-
 .../TestOMDirectoriesPurgeRequestAndResponse.java  |    4 +-
 .../om/request/key/TestOMKeysDeleteRequest.java    |    7 +-
 .../OMLifecycleConfigurationRequestTestBase.java   |    8 +-
 .../TestOMLifecycleConfigurationDeleteRequest.java |   12 +-
 .../TestOMLifecycleConfigurationSetRequest.java    |   12 +-
 .../TestOMLifecycleSaveScanStateRequest.java       |    7 +-
 .../TestOMLifecycleSetServiceStatusRequest.java    |    7 +-
 .../s3/multipart/S3MultipartRequestTests.java      |    8 +-
 .../s3/security/TestS3GetSecretRequest.java        |    9 +-
 .../s3/tenant/TestOMTenantCreateRequest.java       |   10 +-
 .../s3/tenant/TestOMTenantDeleteRequest.java       |    9 +-
 .../tenant/TestSetRangerServiceVersionRequest.java |    7 +-
 .../security/TestOMGetDelegationTokenRequest.java  |    7 +-
 .../upgrade/TestOMCancelPrepareRequest.java        |  122 ---
 .../TestOMCompleteFinalizeUpgradeRequest.java      |  121 +++
 .../upgrade/TestOMStartFinalizeUpgradeRequest.java |  130 +++
 .../TestOMStartFinalizeUpgradeRequestBase.java     |  342 ++++++
 .../TestOMStartFinalizeUpgradeRequestLegacy.java   |   63 ++
 .../validation/TestOMValidatorProcessor.java       |   58 +-
 .../request/validation/TestRequestValidations.java |   14 +-
 .../request/validation/TestVersionExtractor.java   |   23 +-
 .../om/request/volume/OMVolumeRequestTests.java    |    8 +-
 .../TestOMSnapshotMoveTableKeysResponse.java       |    4 +-
 .../TestOMCompleteFinalizeUpgradeResponse.java}    |   64 +-
 .../TestOMStartFinalizeUpgradeResponse.java}       |   74 +-
 .../ozone/om/response/upgrade/package-info.java    |    2 +-
 .../om/service/TestSnapshotDeletingService.java    |    4 +-
 .../snapshot/SnapshotRequestAndResponseTests.java  |    9 +-
 .../snapshot/TestOmSnapshotLocalDataManager.java   |   15 +-
 .../snapshot/defrag/TestSnapshotDefragService.java |    9 +-
 .../hadoop/ozone/om/upgrade/MockOmRequest.java     |   31 -
 .../ozone/om/upgrade/OMLayoutFeatureUtil.java      |   64 --
 .../om/upgrade/OMVersionManagerTestUtils.java      |   63 ++
 .../TestClearPreparedStateOmUpgradeAction.java     |   88 ++
 .../ozone/om/upgrade/TestOMLayoutFeature.java      |  109 ++
 ...Aspect.java => TestOMRequestVersionAspect.java} |   69 +-
 .../om/upgrade/TestOMUpgradeFinalizeService.java   |  268 +++++
 .../ozone/om/upgrade/TestOMUpgradeFinalizer.java   |  274 -----
 .../ozone/om/upgrade/TestOMVersionManager.java     |  284 +++--
 .../om/upgrade/TestOzoneManagerPrepareState.java   |  287 -----
 .../TestOMAdminProtocolServerSideImpl.java         |   45 +
 .../protocolPB/TestOzoneManagerRequestHandler.java |  152 ++-
 .../TestOzoneDelegationTokenSecretManager.java     |    7 +-
 .../recon/schema/SchemaVersionTableDefinition.java |   26 +-
 .../org/apache/ozone/recon/schema/SqlDbUtils.java  |   98 ++
 hadoop-ozone/recon/pom.xml                         |   16 +-
 .../hadoop/ozone/recon/ReconSchemaManager.java     |   16 +-
 .../recon/ReconSchemaVersionTableManager.java      |  102 --
 .../org/apache/hadoop/ozone/recon/ReconServer.java |   50 +-
 .../ozone/recon/api/ClusterStateEndpoint.java      |    3 +-
 .../hadoop/ozone/recon/api/NodeEndpoint.java       |    2 +-
 .../ozone/recon/api/types/DatanodeMetadata.java    |   14 +-
 .../hadoop/ozone/recon/scm/ReconNodeManager.java   |   89 +-
 .../ozone/recon/scm/ReconPipelineManager.java      |    2 +-
 .../scm/ReconStorageContainerManagerFacade.java    |   21 +-
 .../impl/StorageContainerServiceProviderImpl.java  |    2 +-
 .../upgrade/InitialConstraintUpgradeAction.java    |   91 --
 .../upgrade/NSSummaryAggregatedTotalsUpgrade.java  |   24 +-
 .../ozone/recon/upgrade/ReconLayoutFeature.java    |  119 ---
 .../recon/upgrade/ReconLayoutVersionManager.java   |  197 ----
 .../upgrade/ReconTaskStatusTableUpgradeAction.java |   24 +-
 .../ozone/recon/upgrade/ReconUpgradeAction.java    |   82 +-
 .../upgrade/ReconUpgradeActionForVersion.java}     |   11 +-
 .../recon/upgrade/ReconUpgradeActionProvider.java  |   28 +-
 .../hadoop/ozone/recon/upgrade/ReconVersion.java   |  100 ++
 .../ozone/recon/upgrade/ReconVersionManager.java   |  156 +++
 .../ReplicatedSizeOfFilesUpgradeAction.java        |   28 +-
 .../UnhealthyContainerReplicaMismatchAction.java   |   52 +-
 ...ntainersStateContainerIdIndexUpgradeAction.java |   27 +-
 .../ozone/recon/upgrade/UpgradeActionRecon.java    |   59 -
 .../ozone/recon/api/TestClusterStateEndpoint.java  |    2 -
 .../hadoop/ozone/recon/api/TestEndpoints.java      |   24 +-
 .../ozone/recon/api/TestOpenContainerCount.java    |    6 +-
 .../recon/api/TestStorageDistributionEndpoint.java |    3 +-
 .../TestSchemaVersionTableDefinition.java          |   75 +-
 .../scm/AbstractReconContainerManagerTest.java     |   12 +-
 ...TestReconIncrementalContainerReportHandler.java |   15 +-
 .../ozone/recon/scm/TestReconNodeManager.java      |   88 +-
 .../ozone/recon/scm/TestReconPipelineManager.java  |   20 +-
 .../TestInitialConstraintUpgradeAction.java        |  188 ----
 .../TestNSSummaryAggregatedTotalsUpgrade.java      |   24 +
 .../upgrade/TestReconLayoutVersionManager.java     |  377 -------
 .../TestReconTaskStatusTableUpgradeAction.java     |   57 +
 .../ozone/recon/upgrade/TestReconVersion.java      |   59 +
 .../recon/upgrade/TestReconVersionManager.java     |  244 +++++
 .../TestReplicatedSizeOfFilesUpgradeAction.java    |   36 +-
 ...stUnhealthyContainerReplicaMismatchAction.java} |   82 +-
 ...ntainersStateContainerIdIndexUpgradeAction.java |   25 +-
 .../java/org/apache/hadoop/ozone/s3/Gateway.java   |    6 +
 .../ozone/s3/metrics/S3GatewayVersionMetrics.java  |   76 ++
 .../hadoop/ozone/client/ClientProtocolStub.java    |    2 +-
 .../s3/metrics/TestS3GatewayVersionMetrics.java    |   31 +-
 .../ozone/freon/DatanodeSimulationState.java       |    6 +-
 .../hadoop/ozone/freon/DatanodeSimulator.java      |   44 +-
 .../hadoop/ozone/freon/SCMThroughputBenchmark.java |    4 +-
 535 files changed, 15776 insertions(+), 13476 deletions(-)
 rename 
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/{DatanodeVersion.java 
=> HDDSVersion.java} (50%)
 delete mode 100644 
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/upgrade/BelongsToHDDSLayoutVersion.java
 delete mode 100644 
hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/Versioned.java
 rename 
hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/{LayoutFeature.java
 => ComponentUpgradeActionProvider.java} (54%)
 rename 
hadoop-hdds/{framework/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionManagerMXBean.java
 => common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeAction.java} 
(72%)
 create mode 100644 
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/AbstractComponentVersionTest.java
 create mode 100644 
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/ComponentVersionTestUtils.java
 copy 
hadoop-hdds/common/src/{main/java/org/apache/hadoop/hdds/HddsIdFactory.java => 
test/java/org/apache/hadoop/hdds/TestClientVersion.java} (62%)
 delete mode 100644 
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestComponentVersionInvariants.java
 create mode 100644 
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHDDSVersion.java
 create mode 100644 
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestOzoneManagerVersion.java
 create mode 100644 
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerProtocolCalls.java
 create mode 100644 
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/utils/TestClientCommandsUtils.java
 copy 
hadoop-hdds/{common/src/main/java/org/apache/hadoop/hdds/upgrade/HDDSUpgradeAction.java
 => 
container-service/src/main/java/org/apache/hadoop/hdds/upgrade/DatanodeUpgradeAction.java}
 (71%)
 create mode 100644 
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/upgrade/DatanodeUpgradeActionProvider.java
 copy hadoop-hdds/{common => 
container-service}/src/main/java/org/apache/hadoop/hdds/upgrade/package-info.java
 (94%)
 rename 
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/{DatanodeLayoutStorage.java
 => DatanodeStorage.java} (79%)
 rename 
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/{FinalizeNewLayoutVersionCommandHandler.java
 => FinalizeVersionCommandHandler.java} (62%)
 delete mode 100644 
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java
 create mode 100644 
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DatanodeVersionManager.java
 rename 
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/{FinalizeNewLayoutVersionCommand.java
 => FinalizeVersionCommand.java} (51%)
 copy 
hadoop-hdds/{framework/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeActionHdds.java
 => 
container-service/src/main/java/org/apache/hadoop/ozone/upgrade/DatanodeUpgradeActionForLayoutFeature.java}
 (80%)
 copy 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/BelongsToLayoutVersion.java
 => 
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/upgrade/DatanodeUpgradeActionForVersion.java
 (80%)
 copy hadoop-hdds/{common/src/main/java/org/apache/hadoop/hdds/scm/ha => 
container-service/src/main/java/org/apache/hadoop/ozone/upgrade}/package-info.java
 (90%)
 create mode 100644 
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestFinalizeVersionCommandHandler.java
 copy 
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectEndpoint.java
 => 
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestDispatcherContext.java
 (52%)
 rename 
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/{TestDataNodeStartupSlvLessThanMlv.java
 => TestDatanodeStartupInvalidApparentVersion.java} (53%)
 create mode 100644 
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeVersionManager.java
 copy 
hadoop-hdds/container-service/src/{main/java/org/apache/hadoop/ozone/container/upgrade/package-info.java
 => 
test/java/org/apache/hadoop/ozone/container/upgrade/ZduDatanodeUpgradeActionForTest.java}
 (56%)
 create mode 100644 
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/protocol/commands/TestReconcileContainerCommand.java
 create mode 100644 
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/protocol/commands/TestReconstructECContainersCommand.java
 create mode 100644 
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/protocol/commands/TestReplicateContainerCommand.java
 create mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BuildInfoMetrics.java
 rename hadoop-hdds/{common => 
framework}/src/main/java/org/apache/hadoop/hdds/upgrade/HDDSLayoutFeature.java 
(57%)
 delete mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/upgrade/HDDSLayoutVersionManager.java
 create mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/upgrade/HDDSVersionUtils.java
 delete mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractLayoutVersionManager.java
 create mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractUpgradeActionProvider.java
 delete mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java
 create mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/ComponentVersionManager.java
 create mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/ComponentVersionManagerMetrics.java
 delete mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/DefaultUpgradeFinalizationExecutor.java
 delete mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionManager.java
 create mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/RatisBasedVersionManager.java
 delete mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizationExecutor.java
 delete mode 100644 
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java
 create mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/http/TestBuildInfoMetrics.java
 create mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSLayoutFeature.java
 delete mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSLayoutVersionManager.java
 delete mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/upgrade/test/MockComponent.java
 create mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/AbstractComponentVersionManagerTest.java
 delete mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/InjectedUpgradeFinalizationExecutor.java
 delete mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestAbstractLayoutVersionManager.java
 create mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestAbstractUpgradeActionProvider.java
 delete mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestBasicUpgradeFinalizer.java
 delete mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestDefaultUpgradeFinalizationExecutor.java
 delete mode 100644 
hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestUpgradeFinalizerActions.java
 delete mode 100644 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/HealthyReadOnlyNodeHandler.java
 rename 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/{ReadOnlyHealthyToHealthyNodeHandler.java
 => UnhealthyToHealthyNodeHandler.java} (63%)
 create mode 100644 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/ClearFinalizingStateScmUpgradeAction.java
 delete mode 100644 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationCheckpoint.java
 delete mode 100644 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizationContext.java
 delete mode 100644 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java
 create mode 100644 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/ScmVersionManager.java
 rename 
hadoop-hdds/{common/src/main/java/org/apache/hadoop/hdds/upgrade/HDDSUpgradeAction.java
 => 
server-scm/src/main/java/org/apache/hadoop/hdds/upgrade/ScmUpgradeAction.java} 
(70%)
 create mode 100644 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/upgrade/ScmUpgradeActionProvider.java
 copy hadoop-hdds/{common => 
server-scm}/src/main/java/org/apache/hadoop/hdds/upgrade/package-info.java (93%)
 rename 
hadoop-hdds/{framework/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeActionHdds.java
 => 
server-scm/src/main/java/org/apache/hadoop/ozone/upgrade/ScmUpgradeActionForLayoutFeature.java}
 (80%)
 copy 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/UpgradeActionOm.java
 => 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/ozone/upgrade/ScmUpgradeActionForVersion.java
 (81%)
 copy hadoop-hdds/{common/src/main/java/org/apache/hadoop/hdds/fs => 
server-scm/src/main/java/org/apache/hadoop/ozone/upgrade}/package-info.java 
(91%)
 create mode 100644 
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/protocol/TestScmBlockLocationProtocolServerSideTranslatorPB.java
 create mode 100644 
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/protocol/TestStorageContainerLocationProtocolServerSideTranslatorPB.java
 create mode 100644 
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/upgrade/TestClearFinalizingStateScmUpgradeAction.java
 create mode 100644 
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/upgrade/TestScmVersionManager.java
 delete mode 100644 
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/FinalizationManagerTestImpl.java
 create mode 100644 
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/ScmUpgradeTestUtils.java
 delete mode 100644 
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/TestScmFinalization.java
 rename 
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/{TestScmStartupSlvLessThanMlv.java
 => TestScmStartupInvalidApparentVersion.java} (55%)
 create mode 100644 
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/upgrade/FinalizeSubCommand.java
 create mode 100644 
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/upgrade/StatusSubCommand.java
 copy 
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/{hdds/scm/cli/cert/CertCommands.java
 => ozone/admin/upgrade/UpgradeCommands.java} (74%)
 copy {hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs => 
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/upgrade}/package-info.java
 (91%)
 create mode 100644 
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/ozone/admin/upgrade/TestFinalizeSubCommand.java
 create mode 100644 
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/ozone/admin/upgrade/TestStatusSubCommand.java
 create mode 100644 
hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Rolling 
Upgrade.json
 delete mode 100644 hadoop-ozone/dist/src/main/compose/ozone-om-prepare/.env
 delete mode 100644 
hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
 delete mode 100644 
hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-config
 delete mode 100755 hadoop-ozone/dist/src/main/compose/ozone-om-prepare/test.sh
 create mode 100644 
hadoop-ozone/dist/src/main/compose/upgrade/upgrades/rolling-upgrade/callbacks/common/callback.sh
 create mode 100755 
hadoop-ozone/dist/src/main/compose/upgrade/upgrades/rolling-upgrade/driver.sh
 delete mode 100644 
hadoop-ozone/dist/src/main/smoketest/omha/om-cancel-prepare.robot
 delete mode 100644 hadoop-ozone/dist/src/main/smoketest/omha/om-prepare.robot
 delete mode 100644 hadoop-ozone/dist/src/main/smoketest/omha/om-prepared.robot
 rename hadoop-ozone/dist/src/main/smoketest/upgrade/{ => 
non-rolling}/check-finalization.robot (98%)
 copy hadoop-ozone/dist/src/main/smoketest/upgrade/{ => 
non-rolling}/finalize.robot (96%)
 rename hadoop-ozone/dist/src/main/smoketest/upgrade/{ => 
non-rolling}/lib.robot (91%)
 rename hadoop-ozone/dist/src/main/smoketest/upgrade/{ => 
non-rolling}/prepare.robot (83%)
 copy hadoop-ozone/dist/src/main/smoketest/upgrade/{finalize.robot => 
rolling/check-finalization.robot} (68%)
 rename hadoop-ozone/dist/src/main/smoketest/upgrade/{ => 
rolling}/finalize.robot (72%)
 delete mode 100644 
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
 create mode 100644 
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDatanodeCurrentVersionEndToEnd.java
 rename 
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/{TestOmStartupSlvLessThanMlv.java
 => TestOmStartupInvalidApparentVersion.java} (55%)
 delete mode 100644 
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java
 create mode 100644 
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestUpgradeFinalizationWithOldClients.java
 delete mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerPrepareState.java
 delete mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMCancelPrepareRequest.java
 rename 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/{OMFinalizeUpgradeRequest.java
 => OMCompleteFinalizeUpgradeRequest.java} (54%)
 create mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMFinalizeUpgradeRequestBase.java
 delete mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMPrepareRequest.java
 copy 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/{util/OmResponseUtil.java
 => upgrade/OMStartFinalizeUpgradeRequest.java} (55%)
 create mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMStartFinalizeUpgradeRequestLegacy.java
 delete mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMCancelPrepareResponse.java
 copy 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/{OMFinalizeUpgradeResponse.java
 => OMCompleteFinalizeUpgradeResponse.java} (60%)
 delete mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/OMPrepareResponse.java
 rename 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/upgrade/{OMFinalizeUpgradeResponse.java
 => OMStartFinalizeUpgradeResponse.java} (52%)
 create mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/ClearPreparedStateOmUpgradeAction.java
 copy 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/{DisallowedUntilLayoutVersion.java
 => DisallowedUntilOmVersion.java} (66%)
 delete mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutVersionManager.java
 rename 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/{OMLayoutFeatureAspect.java
 => OMRequestVersionAspect.java} (50%)
 create mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMUpgradeActionProvider.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMUpgradeFinalizeService.java
 delete mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMUpgradeFinalizer.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMVersionManager.java
 rename 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/{UpgradeActionOm.java
 => OmUpgradeActionForLayoutFeature.java} (95%)
 copy 
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/{BelongsToLayoutVersion.java
 => OmUpgradeActionForVersion.java} (83%)
 delete mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/upgrade/TestOMCancelPrepareRequest.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/upgrade/TestOMCompleteFinalizeUpgradeRequest.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/upgrade/TestOMStartFinalizeUpgradeRequest.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/upgrade/TestOMStartFinalizeUpgradeRequestBase.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/upgrade/TestOMStartFinalizeUpgradeRequestLegacy.java
 copy 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/{bucket/TestOMBucketSetPropertyResponse.java
 => upgrade/TestOMCompleteFinalizeUpgradeResponse.java} (51%)
 copy 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/{bucket/TestOMBucketCreateResponse.java
 => upgrade/TestOMStartFinalizeUpgradeResponse.java} (50%)
 copy hadoop-ozone/ozone-manager/src/{main => 
test}/java/org/apache/hadoop/ozone/om/response/upgrade/package-info.java (92%)
 delete mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/MockOmRequest.java
 delete mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutFeatureUtil.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/OMVersionManagerTestUtils.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestClearPreparedStateOmUpgradeAction.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMLayoutFeature.java
 rename 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/{TestOMLayoutFeatureAspect.java
 => TestOMRequestVersionAspect.java} (53%)
 create mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMUpgradeFinalizeService.java
 delete mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMUpgradeFinalizer.java
 delete mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOzoneManagerPrepareState.java
 create mode 100644 
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/protocolPB/TestOMAdminProtocolServerSideImpl.java
 delete mode 100644 
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconSchemaVersionTableManager.java
 delete mode 100644 
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/InitialConstraintUpgradeAction.java
 delete mode 100644 
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/ReconLayoutFeature.java
 delete mode 100644 
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/ReconLayoutVersionManager.java
 rename 
hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/BelongsToLayoutVersion.java
 => 
recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/ReconUpgradeActionForVersion.java}
 (77%)
 copy 
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmBigIntegerCodec.java
 => 
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/ReconUpgradeActionProvider.java
 (51%)
 create mode 100644 
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/ReconVersion.java
 create mode 100644 
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/ReconVersionManager.java
 delete mode 100644 
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/UpgradeActionRecon.java
 delete mode 100644 
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/upgrade/TestInitialConstraintUpgradeAction.java
 delete mode 100644 
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/upgrade/TestReconLayoutVersionManager.java
 create mode 100644 
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/upgrade/TestReconVersion.java
 create mode 100644 
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/upgrade/TestReconVersionManager.java
 copy 
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/upgrade/{TestUnhealthyContainersStateContainerIdIndexUpgradeAction.java
 => TestUnhealthyContainerReplicaMismatchAction.java} (58%)
 create mode 100644 
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/metrics/S3GatewayVersionMetrics.java
 copy 
hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/TestConfigFileAppender.java
 => 
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayVersionMetrics.java
 (58%)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to