This is an automated email from the ASF dual-hosted git repository. siyao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ozone.git
commit f01cebe19b62eaa00bb62d606900b83815fbf1f9 Merge: 1a796f1b54 afa6030b90 Author: Siyao Meng <[email protected]> AuthorDate: Wed Feb 1 21:18:43 2023 -0800 Merge remote-tracking branch 'asf/HDDS-6517-Snapshot' Change-Id: I98122590b3b5c81d6d7afd24ae56a6b0d43eca5e .../org/apache/hadoop/ozone/OzoneConfigKeys.java | 32 + .../java/org/apache/hadoop/ozone/OzoneConsts.java | 7 + .../common/src/main/resources/ozone-default.xml | 69 + hadoop-hdds/framework/pom.xml | 10 + .../hadoop/hdds/utils/BooleanTriFunction.java | 37 + .../org/apache/hadoop/hdds/utils/db/DBProfile.java | 25 + .../org/apache/hadoop/hdds/utils/db/DBStore.java | 6 + .../hadoop/hdds/utils/db/DBStoreBuilder.java | 58 +- .../hadoop/hdds/utils/db/RDBCheckpointManager.java | 67 +- .../org/apache/hadoop/hdds/utils/db/RDBStore.java | 81 +- .../apache/hadoop/hdds/utils/db/RocksDatabase.java | 132 ++ hadoop-hdds/pom.xml | 7 + hadoop-hdds/rocksdb-checkpoint-differ/README.md | 18 + .../dev-support/findbugsExcludeFile.xml | 19 + hadoop-hdds/rocksdb-checkpoint-differ/pom.xml | 193 +++ .../ozone/rocksdb/util/ManagedSstFileReader.java | 128 ++ .../org/apache/ozone/rocksdb/util/RdbUtil.java | 61 + .../apache/ozone/rocksdb/util/package-info.java | 22 + .../org/apache/ozone/rocksdiff/CompactionNode.java | 80 ++ .../apache/ozone/rocksdiff/DifferSnapshotInfo.java | 63 + .../apache/ozone/rocksdiff/RelationshipEdge.java | 30 + .../ozone/rocksdiff/RocksDBCheckpointDiffer.java | 1345 ++++++++++++++++++++ .../org/apache/ozone/rocksdiff/RocksDiffUtils.java | 54 + .../org/apache/ozone/rocksdiff/package-info.java | 23 + .../rocksdiff/TestRocksDBCheckpointDiffer.java | 1103 ++++++++++++++++ .../src/test/resources/log4j.properties | 21 + .../apache/hadoop/ozone/client/ObjectStore.java | 43 + .../apache/hadoop/ozone/client/OzoneBucket.java | 7 +- .../apache/hadoop/ozone/client/OzoneSnapshot.java | 145 +++ .../ozone/client/protocol/ClientProtocol.java | 47 + .../apache/hadoop/ozone/client/rpc/RpcClient.java | 71 ++ .../main/java/org/apache/hadoop/ozone/OmUtils.java | 27 + .../org/apache/hadoop/ozone/audit/OMAction.java | 6 +- .../apache/hadoop/ozone/om/IOmMetadataReader.java | 123 ++ .../org/apache/hadoop/ozone/om/OMConfigKeys.java | 14 + .../hadoop/ozone/om/exceptions/OMException.java | 6 +- .../apache/hadoop/ozone/om/helpers/OmKeyInfo.java | 3 +- .../ozone/om/helpers/OmKeyLocationInfoGroup.java | 19 + .../hadoop/ozone/om/helpers/SnapshotInfo.java | 515 ++++++++ .../hadoop/ozone/om/lock/IOzoneManagerLock.java | 98 ++ .../hadoop/ozone/om/lock/OmReadOnlyLock.java | 167 +++ .../hadoop/ozone/om/lock/OzoneManagerLock.java | 36 +- .../hadoop/ozone/om/lock/OzoneManagerLockUtil.java | 12 + .../ozone/om/protocol/OzoneManagerProtocol.java | 108 +- ...OzoneManagerProtocolClientSideTranslatorPB.java | 100 ++ .../hadoop/ozone/snapshot/SnapshotDiffReport.java | 233 ++++ .../apache/hadoop/ozone/snapshot/package-info.java | 22 + .../hadoop/ozone/om/helpers/TestOmKeyInfo.java | 6 +- .../ozone/om/helpers/TestOmSnapshotInfo.java | 147 +++ .../hadoop/ozone/om/lock/TestOzoneManagerLock.java | 9 +- hadoop-ozone/dist/src/main/compose/ozone/test.sh | 2 + hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 20 +- hadoop-ozone/dist/src/main/license/jar-report.txt | 3 + .../dist/src/main/smoketest/snapshot/basic.robot | 56 + .../hadoop/fs/ozone/TestOzoneFsSnapshot.java | 323 +++++ .../hadoop/ozone/freon/TestOMSnapshotDAG.java | 269 ++++ .../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 42 +- .../org/apache/hadoop/ozone/om/TestOmMetrics.java | 65 + .../org/apache/hadoop/ozone/om/TestOmSnapshot.java | 662 ++++++++++ .../hadoop/ozone/om/TestOmSnapshotFileSystem.java | 581 +++++++++ .../om/snapshot/TestOzoneSnapshotRestore.java | 333 +++++ .../src/main/proto/OmClientProtocol.proto | 113 ++ .../apache/hadoop/ozone/om/OMMetadataManager.java | 16 +- .../ozone/om/codec/OmDBSnapshotInfoCodec.java | 58 + hadoop-ozone/ozone-manager/pom.xml | 4 + .../apache/hadoop/ozone/om/BucketManagerImpl.java | 111 -- .../java/org/apache/hadoop/ozone/om/IOzoneAcl.java | 31 - .../org/apache/hadoop/ozone/om/KeyManager.java | 6 + .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 244 +--- .../java/org/apache/hadoop/ozone/om/OMMetrics.java | 116 +- .../hadoop/ozone/om/OmMetadataManagerImpl.java | 197 ++- .../apache/hadoop/ozone/om/OmMetadataReader.java | 583 +++++++++ .../hadoop/ozone/om/OmMetadataReaderMetrics.java | 49 + .../org/apache/hadoop/ozone/om/OmSnapshot.java | 265 ++++ .../apache/hadoop/ozone/om/OmSnapshotManager.java | 271 ++++ .../apache/hadoop/ozone/om/OmSnapshotMetrics.java | 163 +++ .../org/apache/hadoop/ozone/om/OzoneAclUtils.java | 16 +- .../org/apache/hadoop/ozone/om/OzoneManager.java | 578 +++------ .../apache/hadoop/ozone/om/PrefixManagerImpl.java | 104 -- .../apache/hadoop/ozone/om/SnapshotChainInfo.java | 57 + .../hadoop/ozone/om/SnapshotChainManager.java | 512 ++++++++ .../hadoop/ozone/om/SstFilteringService.java | 212 +++ .../apache/hadoop/ozone/om/VolumeManagerImpl.java | 111 -- .../hadoop/ozone/om/codec/OMDBDefinition.java | 13 +- .../ozone/om/ratis/OzoneManagerDoubleBuffer.java | 431 ++++--- .../om/ratis/utils/OzoneManagerRatisUtils.java | 7 +- .../hadoop/ozone/om/request/OMClientRequest.java | 17 +- .../om/request/bucket/OMBucketDeleteRequest.java | 56 + .../hadoop/ozone/om/request/key/OMKeyRequest.java | 2 +- .../request/snapshot/OMSnapshotCreateRequest.java | 190 +++ .../request/snapshot/OMSnapshotDeleteRequest.java | 227 ++++ .../ozone/om/request/snapshot/package-info.java | 23 + .../om/request/validation/RequestValidations.java | 25 +- .../om/request/validation/ValidatorRegistry.java | 7 +- .../snapshot/OMSnapshotCreateResponse.java | 72 ++ .../snapshot/OMSnapshotDeleteResponse.java | 67 + .../ozone/om/response/snapshot/package-info.java | 23 + .../ozone/om/snapshot/SnapshotDiffManager.java | 390 ++++++ ...OzoneManagerProtocolServerSideTranslatorPB.java | 95 +- .../protocolPB/OzoneManagerRequestHandler.java | 40 +- .../hadoop/ozone/om/TestOmMetadataManager.java | 219 +++- .../hadoop/ozone/om/TestOmSnapshotManager.java | 128 ++ .../apache/hadoop/ozone/om/TestSnapshotChain.java | 306 +++++ .../apache/hadoop/ozone/om/TestSnapshotInfo.java | 102 ++ .../hadoop/ozone/om/TestSstFilteringService.java | 294 +++++ .../om/ratis/TestOzoneManagerDoubleBuffer.java | 216 ++++ .../ozone/om/request/OMRequestTestUtils.java | 86 ++ .../ozone/om/request/key/TestOMKeyRequest.java | 4 + .../snapshot/TestOMSnapshotCreateRequest.java | 277 ++++ .../snapshot/TestOMSnapshotDeleteRequest.java | 331 +++++ .../ozone/om/request/snapshot/package-info.java | 23 + .../snapshot/TestOMSnapshotCreateResponse.java | 122 ++ .../snapshot/TestOMSnapshotDeleteResponse.java | 125 ++ .../ozone/om/response/snapshot/package-info.java | 23 + .../fs/ozone/BasicOzoneClientAdapterImpl.java | 10 + .../hadoop/fs/ozone/BasicOzoneFileSystem.java | 10 +- .../ozone/BasicRootedOzoneClientAdapterImpl.java | 9 + .../fs/ozone/BasicRootedOzoneFileSystem.java | 9 + .../apache/hadoop/fs/ozone/OzoneClientAdapter.java | 2 + hadoop-ozone/pom.xml | 5 + .../recon/recovery/ReconOmMetadataManagerImpl.java | 2 +- .../hadoop/ozone/client/ClientProtocolStub.java | 28 + .../shell/snapshot/CreateSnapshotHandler.java | 62 + .../shell/snapshot/DeleteSnapshotHandler.java | 61 + .../ozone/shell/snapshot/ListSnapshotHandler.java | 62 + .../ozone/shell/snapshot/SnapshotCommands.java | 75 ++ .../ozone/shell/snapshot/SnapshotDiffHandler.java | 67 + .../hadoop/ozone/shell/snapshot/package-info.java | 23 + pom.xml | 9 +- 129 files changed, 14815 insertions(+), 1388 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
