Merge branch 'HDDS-48-merge' into trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/021ab63c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/021ab63c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/021ab63c Branch: refs/heads/HDDS-48 Commit: 021ab63c350b2e16fca0a40071a492838b0301f7 Parents: 4a08ddf f870f0d Author: Bharat Viswanadham <bha...@apache.org> Authored: Mon Jul 9 12:54:14 2018 -0700 Committer: Bharat Viswanadham <bha...@apache.org> Committed: Mon Jul 9 12:54:14 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hdds/scm/ScmConfigKeys.java | 1 + .../scm/storage/ContainerProtocolCalls.java | 24 +- .../apache/hadoop/ozone/OzoneConfigKeys.java | 12 + .../org/apache/hadoop/ozone/OzoneConsts.java | 18 + .../org/apache/hadoop/ozone/common/Storage.java | 3 +- .../hadoop/utils/MetadataStoreBuilder.java | 40 +- .../main/proto/DatanodeContainerProtocol.proto | 18 +- .../common/src/main/resources/ozone-default.xml | 33 + .../apache/hadoop/ozone/TestMetadataStore.java | 484 -------- .../apache/hadoop/utils/TestMetadataStore.java | 533 +++++++++ hadoop-hdds/container-service/pom.xml | 6 + .../container/common/DataNodeLayoutVersion.java | 80 ++ .../container/common/helpers/ChunkUtils.java | 344 ------ .../container/common/helpers/ContainerData.java | 512 -------- .../common/helpers/ContainerMetrics.java | 2 +- .../common/helpers/ContainerUtils.java | 328 ++--- .../common/helpers/DatanodeVersionFile.java | 95 ++ .../container/common/helpers/FileUtils.java | 82 -- .../container/common/helpers/KeyUtils.java | 148 --- .../common/impl/ChunkLayOutVersion.java | 98 ++ .../container/common/impl/ChunkManagerImpl.java | 233 ---- .../container/common/impl/ContainerData.java | 477 ++++++++ .../common/impl/ContainerDataYaml.java | 277 +++++ .../impl/ContainerLocationManagerImpl.java | 158 --- .../common/impl/ContainerManagerImpl.java | 1120 ------------------ .../container/common/impl/ContainerSet.java | 255 ++++ .../common/impl/ContainerStorageLocation.java | 212 ---- .../ozone/container/common/impl/Dispatcher.java | 687 ----------- .../container/common/impl/HddsDispatcher.java | 208 ++++ .../container/common/impl/KeyManagerImpl.java | 204 ---- .../RandomContainerDeletionChoosingPolicy.java | 1 - ...NOrderedContainerDeletionChoosingPolicy.java | 1 - .../common/interfaces/ChunkManager.java | 73 -- .../container/common/interfaces/Container.java | 100 ++ .../ContainerDeletionChoosingPolicy.java | 3 +- .../common/interfaces/ContainerDispatcher.java | 14 + .../common/interfaces/ContainerManager.java | 269 ----- .../container/common/interfaces/Handler.java | 74 ++ .../container/common/interfaces/KeyManager.java | 73 -- .../common/interfaces/VolumeChoosingPolicy.java | 46 + .../statemachine/DatanodeStateMachine.java | 4 +- .../background/BlockDeletingService.java | 246 ---- .../statemachine/background/package-info.java | 18 - .../DeleteBlocksCommandHandler.java | 61 +- .../states/datanode/RunningDatanodeState.java | 3 +- .../states/endpoint/VersionEndpointTask.java | 31 +- .../server/ratis/ContainerStateMachine.java | 5 +- .../container/common/utils/ContainerCache.java | 6 +- .../container/common/utils/HddsVolumeUtil.java | 163 +++ .../container/common/volume/HddsVolume.java | 342 ++++++ .../volume/RoundRobinVolumeChoosingPolicy.java | 83 ++ .../container/common/volume/VolumeIOStats.java | 139 +++ .../container/common/volume/VolumeInfo.java | 132 +++ .../container/common/volume/VolumeSet.java | 357 ++++++ .../container/common/volume/VolumeUsage.java | 198 ++++ .../container/common/volume/package-info.java | 21 + .../container/keyvalue/KeyValueContainer.java | 483 ++++++++ .../keyvalue/KeyValueContainerData.java | 280 +++++ .../container/keyvalue/KeyValueHandler.java | 694 +++++++++++ .../container/keyvalue/helpers/ChunkUtils.java | 357 ++++++ .../container/keyvalue/helpers/KeyUtils.java | 147 +++ .../helpers/KeyValueContainerLocationUtil.java | 140 +++ .../keyvalue/helpers/KeyValueContainerUtil.java | 316 +++++ .../keyvalue/helpers/SmallFileUtils.java | 84 ++ .../keyvalue/helpers/package-info.java | 21 + .../keyvalue/impl/ChunkManagerImpl.java | 254 ++++ .../container/keyvalue/impl/KeyManagerImpl.java | 198 ++++ .../container/keyvalue/impl/package-info.java | 22 + .../keyvalue/interfaces/ChunkManager.java | 80 ++ .../keyvalue/interfaces/KeyManager.java | 76 ++ .../ozone/container/keyvalue/package-info.java | 21 + .../background/BlockDeletingService.java | 248 ++++ .../statemachine/background/package-info.java | 18 + .../container/ozoneimpl/ContainerReader.java | 177 +++ .../container/ozoneimpl/OzoneContainer.java | 396 +++---- .../hadoop/ozone/protocol/VersionResponse.java | 4 + .../ozone/container/common/SCMTestUtils.java | 13 +- .../ozone/container/common/ScmTestMock.java | 4 + .../common/TestChunkLayOutVersion.java | 42 + .../common/TestDatanodeLayOutVersion.java | 38 + .../common/TestKeyValueContainerData.java | 85 ++ .../common/helpers/TestDatanodeVersionFile.java | 134 +++ .../common/impl/TestContainerDataYaml.java | 167 +++ .../container/common/impl/TestContainerSet.java | 179 +++ .../common/interfaces/TestHandler.java | 89 ++ .../container/common/volume/TestHddsVolume.java | 145 +++ .../TestRoundRobinVolumeChoosingPolicy.java | 127 ++ .../container/common/volume/TestVolumeSet.java | 153 +++ .../keyvalue/TestChunkManagerImpl.java | 290 +++++ .../container/keyvalue/TestKeyManagerImpl.java | 189 +++ .../keyvalue/TestKeyValueContainer.java | 267 +++++ .../container/keyvalue/TestKeyValueHandler.java | 201 ++++ .../container/ozoneimpl/TestOzoneContainer.java | 108 ++ .../testutils/BlockDeletingServiceTestImpl.java | 9 +- .../test/resources/additionalfields.container | 11 + .../src/test/resources/incorrect.container | 10 + hadoop-hdds/pom.xml | 2 + .../hadoop/hdds/scm/node/SCMNodeManager.java | 4 + .../ozone/container/common/TestEndPoint.java | 20 +- .../fsdataset/VolumeChoosingPolicy.java | 2 +- .../ozone/client/io/ChunkGroupInputStream.java | 6 +- .../client/io/OzoneContainerTranslation.java | 50 - .../TestStorageContainerManagerHelper.java | 11 +- .../ozone/container/ContainerTestHelper.java | 27 +- .../common/TestBlockDeletingService.java | 118 +- .../TestContainerDeletionChoosingPolicy.java | 63 +- .../common/impl/TestContainerPersistence.java | 478 ++++---- .../commandhandler/TestBlockDeletion.java | 32 +- .../TestCloseContainerByPipeline.java | 6 +- .../TestCloseContainerHandler.java | 6 +- .../container/metrics/TestContainerMetrics.java | 60 +- .../container/ozoneimpl/TestOzoneContainer.java | 19 +- .../container/server/TestContainerServer.java | 24 +- ...TestGenerateOzoneRequiredConfigurations.java | 5 +- .../ozone/om/TestContainerReportWithKeys.java | 14 +- .../ozone/scm/TestContainerSmallFile.java | 2 +- .../org/apache/hadoop/ozone/scm/TestSCMCli.java | 62 +- .../hadoop/ozone/web/client/TestKeys.java | 24 +- .../genesis/BenchMarkDatanodeDispatcher.java | 41 +- 119 files changed, 10522 insertions(+), 5986 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
