You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2018/04/26 21:01:20 UTC
[51/68] [abbrv] [partial] hadoop git commit: HDFS-13405. Ozone:
Rename HDSL to HDDS. Contributed by Ajay Kumar, Elek Marton, Mukul Kumar Singh,
Shashikant Banerjee and Anu Engineer.
HDFS-13405. Ozone: Rename HDSL to HDDS.
Contributed by Ajay Kumar, Elek Marton, Mukul Kumar Singh, Shashikant Banerjee and Anu Engineer.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8b832f3c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8b832f3c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8b832f3c
Branch: refs/heads/trunk-rebase
Commit: 8b832f3c3556ef3f970bac636ef9c70ee9dd260d
Parents: 792ac4d
Author: Anu Engineer <ae...@apache.org>
Authored: Thu Apr 5 11:24:39 2018 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Thu Apr 26 05:36:04 2018 -0700
----------------------------------------------------------------------
.../main/resources/assemblies/hadoop-src.xml | 2 +-
hadoop-cblock/server/pom.xml | 8 +-
.../org/apache/hadoop/cblock/CBlockManager.java | 14 +-
.../org/apache/hadoop/cblock/CblockUtils.java | 4 +-
.../cblock/client/CBlockVolumeClient.java | 2 +-
.../cblock/jscsiHelper/BlockWriterTask.java | 6 +-
...ockClientProtocolClientSideTranslatorPB.java | 2 +-
.../cblock/jscsiHelper/CBlockIStorageImpl.java | 4 +-
.../cblock/jscsiHelper/CBlockTargetServer.java | 4 +-
.../jscsiHelper/ContainerCacheFlusher.java | 4 +-
.../cblock/jscsiHelper/SCSITargetDaemon.java | 20 +-
.../cache/impl/AsyncBlockWriter.java | 8 +-
.../cache/impl/CBlockLocalCache.java | 4 +-
.../jscsiHelper/cache/impl/SyncBlockReader.java | 8 +-
.../cblock/kubernetes/DynamicProvisioner.java | 2 +-
.../hadoop/cblock/meta/ContainerDescriptor.java | 2 +-
.../hadoop/cblock/meta/VolumeDescriptor.java | 2 +-
.../cblock/proto/MountVolumeResponse.java | 2 +-
...entServerProtocolServerSideTranslatorPB.java | 2 +-
.../hadoop/cblock/storage/StorageManager.java | 12 +-
.../main/proto/CBlockClientServerProtocol.proto | 4 +-
.../apache/hadoop/cblock/TestBufferManager.java | 12 +-
.../hadoop/cblock/TestCBlockReadWrite.java | 20 +-
.../apache/hadoop/cblock/TestCBlockServer.java | 4 +-
.../cblock/TestCBlockServerPersistence.java | 4 +-
.../hadoop/cblock/TestLocalBlockCache.java | 12 +-
.../kubernetes/TestDynamicProvisioner.java | 2 +-
.../cblock/util/ContainerLookUpService.java | 2 +-
.../hadoop/cblock/util/MockStorageClient.java | 24 +-
.../org/apache/hadoop/cblock/cli/CBlockCli.java | 2 +-
.../org/apache/hadoop/cblock/TestCBlockCLI.java | 2 +-
.../src/main/bin/hadoop-functions.sh | 4 +-
hadoop-dist/pom.xml | 10 +-
.../src/main/compose/cblock/docker-config | 2 +-
.../src/main/compose/ozone/docker-config | 2 +-
hadoop-hdds/client/pom.xml | 49 +
.../apache/hadoop/hdds/scm/XceiverClient.java | 192 +++
.../hadoop/hdds/scm/XceiverClientHandler.java | 202 +++
.../hdds/scm/XceiverClientInitializer.java | 72 +
.../hadoop/hdds/scm/XceiverClientManager.java | 218 +++
.../hadoop/hdds/scm/XceiverClientMetrics.java | 92 ++
.../hadoop/hdds/scm/XceiverClientRatis.java | 266 ++++
.../scm/client/ContainerOperationClient.java | 407 ++++++
.../hadoop/hdds/scm/client/HddsClientUtils.java | 232 ++++
.../hadoop/hdds/scm/client/package-info.java | 23 +
.../apache/hadoop/hdds/scm/package-info.java | 23 +
.../hdds/scm/storage/ChunkInputStream.java | 261 ++++
.../hdds/scm/storage/ChunkOutputStream.java | 227 +++
.../hadoop/hdds/scm/storage/package-info.java | 23 +
.../common/dev-support/findbugsExcludeFile.xml | 21 +
hadoop-hdds/common/pom.xml | 128 ++
.../org/apache/hadoop/hdds/HddsConfigKeys.java | 6 +
.../java/org/apache/hadoop/hdds/HddsUtils.java | 272 ++++
.../apache/hadoop/hdds/client/OzoneQuota.java | 203 +++
.../hadoop/hdds/client/ReplicationFactor.java | 63 +
.../hadoop/hdds/client/ReplicationType.java | 28 +
.../apache/hadoop/hdds/client/package-info.java | 23 +
.../hadoop/hdds/conf/OzoneConfiguration.java | 162 +++
.../apache/hadoop/hdds/conf/package-info.java | 18 +
.../org/apache/hadoop/hdds/package-info.java | 23 +
.../hadoop/hdds/protocol/DatanodeDetails.java | 422 ++++++
.../hadoop/hdds/protocol/package-info.java | 22 +
.../apache/hadoop/hdds/scm/ScmConfigKeys.java | 271 ++++
.../org/apache/hadoop/hdds/scm/ScmInfo.java | 81 ++
.../hadoop/hdds/scm/XceiverClientSpi.java | 129 ++
.../hadoop/hdds/scm/client/ScmClient.java | 139 ++
.../hadoop/hdds/scm/client/package-info.java | 24 +
.../hadoop/hdds/scm/container/ContainerID.java | 97 ++
.../common/helpers/AllocatedBlock.java | 77 ++
.../container/common/helpers/ContainerInfo.java | 333 +++++
.../common/helpers/DeleteBlockResult.java | 51 +
.../scm/container/common/helpers/Pipeline.java | 253 ++++
.../common/helpers/PipelineChannel.java | 122 ++
.../helpers/StorageContainerException.java | 104 ++
.../container/common/helpers/package-info.java | 22 +
.../apache/hadoop/hdds/scm/package-info.java | 24 +
.../hdds/scm/protocol/LocatedContainer.java | 127 ++
.../scm/protocol/ScmBlockLocationProtocol.java | 72 +
.../hdds/scm/protocol/ScmLocatedBlock.java | 100 ++
.../StorageContainerLocationProtocol.java | 124 ++
.../hadoop/hdds/scm/protocol/package-info.java | 19 +
...kLocationProtocolClientSideTranslatorPB.java | 215 +++
.../protocolPB/ScmBlockLocationProtocolPB.java | 35 +
...rLocationProtocolClientSideTranslatorPB.java | 316 +++++
.../StorageContainerLocationProtocolPB.java | 36 +
.../hdds/scm/protocolPB/package-info.java | 24 +
.../scm/storage/ContainerProtocolCalls.java | 396 ++++++
.../hadoop/hdds/scm/storage/package-info.java | 23 +
.../java/org/apache/hadoop/ozone/OzoneAcl.java | 231 ++++
.../apache/hadoop/ozone/OzoneConfigKeys.java | 238 ++++
.../org/apache/hadoop/ozone/OzoneConsts.java | 167 +++
.../apache/hadoop/ozone/common/BlockGroup.java | 87 ++
.../ozone/common/DeleteBlockGroupResult.java | 96 ++
.../InconsistentStorageStateException.java | 51 +
.../org/apache/hadoop/ozone/common/Storage.java | 248 ++++
.../apache/hadoop/ozone/common/StorageInfo.java | 183 +++
.../hadoop/ozone/common/package-info.java | 18 +
.../InvalidStateTransitionException.java | 42 +
.../ozone/common/statemachine/StateMachine.java | 68 +
.../ozone/common/statemachine/package-info.java | 21 +
.../container/common/helpers/ChunkInfo.java | 185 +++
.../ozone/container/common/helpers/KeyData.java | 170 +++
.../container/common/helpers/package-info.java | 23 +
.../org/apache/hadoop/ozone/lease/Lease.java | 189 +++
.../ozone/lease/LeaseAlreadyExistException.java | 46 +
.../ozone/lease/LeaseCallbackExecutor.java | 65 +
.../hadoop/ozone/lease/LeaseException.java | 45 +
.../ozone/lease/LeaseExpiredException.java | 45 +
.../apache/hadoop/ozone/lease/LeaseManager.java | 247 ++++
.../lease/LeaseManagerNotRunningException.java | 45 +
.../ozone/lease/LeaseNotFoundException.java | 46 +
.../apache/hadoop/ozone/lease/package-info.java | 26 +
.../org/apache/hadoop/ozone/package-info.java | 35 +
...kLocationProtocolServerSideTranslatorPB.java | 170 +++
...rLocationProtocolServerSideTranslatorPB.java | 212 +++
.../hadoop/ozone/protocolPB/package-info.java | 24 +
.../hadoop/ozone/web/utils/JsonUtils.java | 71 +
.../apache/hadoop/utils/BackgroundService.java | 161 +++
.../org/apache/hadoop/utils/BackgroundTask.java | 28 +
.../hadoop/utils/BackgroundTaskQueue.java | 64 +
.../hadoop/utils/BackgroundTaskResult.java | 44 +
.../org/apache/hadoop/utils/BatchOperation.java | 90 ++
.../org/apache/hadoop/utils/EntryConsumer.java | 38 +
.../org/apache/hadoop/utils/LevelDBStore.java | 380 ++++++
.../apache/hadoop/utils/MetadataKeyFilters.java | 118 ++
.../org/apache/hadoop/utils/MetadataStore.java | 172 +++
.../hadoop/utils/MetadataStoreBuilder.java | 126 ++
.../org/apache/hadoop/utils/RocksDBStore.java | 382 ++++++
.../apache/hadoop/utils/RocksDBStoreMBean.java | 144 ++
.../org/apache/hadoop/utils/package-info.java | 18 +
.../main/java/org/apache/ratis/RatisHelper.java | 129 ++
.../java/org/apache/ratis/package-info.java | 22 +
.../com/google/protobuf/ShadedProtoUtil.java | 38 +
.../com/google/protobuf/package-info.java | 22 +
.../main/proto/DatanodeContainerProtocol.proto | 415 ++++++
.../main/proto/ScmBlockLocationProtocol.proto | 166 +++
.../StorageContainerLocationProtocol.proto | 214 +++
hadoop-hdds/common/src/main/proto/hdds.proto | 172 +++
.../common/src/main/resources/ozone-default.xml | 1031 ++++++++++++++
.../org/apache/hadoop/hdds/scm/TestArchive.java | 114 ++
.../apache/hadoop/hdds/scm/package-info.java | 21 +
.../apache/hadoop/ozone/TestMetadataStore.java | 414 ++++++
.../org/apache/hadoop/ozone/TestOzoneAcls.java | 141 ++
.../hadoop/ozone/common/TestStateMachine.java | 106 ++
.../hadoop/ozone/lease/TestLeaseManager.java | 374 +++++
.../apache/hadoop/ozone/lease/package-info.java | 21 +
.../org/apache/hadoop/ozone/package-info.java | 21 +
.../hadoop/utils/TestRocksDBStoreMBean.java | 87 ++
hadoop-hdds/container-service/pom.xml | 98 ++
.../apache/hadoop/hdds/scm/HddsServerUtil.java | 322 +++++
.../org/apache/hadoop/hdds/scm/VersionInfo.java | 81 ++
.../hadoop/ozone/HddsDatanodeService.java | 140 ++
.../container/common/helpers/ChunkUtils.java | 346 +++++
.../container/common/helpers/ContainerData.java | 326 +++++
.../common/helpers/ContainerMetrics.java | 121 ++
.../common/helpers/ContainerReport.java | 218 +++
.../common/helpers/ContainerUtils.java | 442 ++++++
.../helpers/DeletedContainerBlocksSummary.java | 103 ++
.../container/common/helpers/FileUtils.java | 81 ++
.../container/common/helpers/KeyUtils.java | 148 ++
.../container/common/helpers/package-info.java | 22 +
.../container/common/impl/ChunkManagerImpl.java | 233 ++++
.../common/impl/ContainerManagerImpl.java | 1113 +++++++++++++++
.../common/impl/ContainerReportManagerImpl.java | 90 ++
.../container/common/impl/ContainerStatus.java | 217 +++
.../common/impl/ContainerStorageLocation.java | 203 +++
.../ozone/container/common/impl/Dispatcher.java | 713 ++++++++++
.../container/common/impl/KeyManagerImpl.java | 202 +++
.../RandomContainerDeletionChoosingPolicy.java | 70 +
.../common/impl/StorageLocationReport.java | 63 +
...NOrderedContainerDeletionChoosingPolicy.java | 91 ++
.../container/common/impl/package-info.java | 22 +
.../common/interfaces/ChunkManager.java | 76 ++
.../ContainerDeletionChoosingPolicy.java | 46 +
.../common/interfaces/ContainerDispatcher.java | 51 +
.../interfaces/ContainerLocationManager.java | 58 +
.../ContainerLocationManagerMXBean.java | 36 +
.../common/interfaces/ContainerManager.java | 280 ++++
.../interfaces/ContainerReportManager.java | 32 +
.../container/common/interfaces/KeyManager.java | 76 ++
.../common/interfaces/package-info.java | 20 +
.../ozone/container/common/package-info.java | 28 +
.../statemachine/DatanodeStateMachine.java | 387 ++++++
.../statemachine/EndpointStateMachine.java | 294 ++++
.../statemachine/EndpointStateMachineMBean.java | 34 +
.../statemachine/SCMConnectionManager.java | 208 +++
.../SCMConnectionManagerMXBean.java | 27 +
.../common/statemachine/StateContext.java | 285 ++++
.../background/BlockDeletingService.java | 239 ++++
.../statemachine/background/package-info.java | 18 +
.../commandhandler/CloseContainerHandler.java | 112 ++
.../commandhandler/CommandDispatcher.java | 177 +++
.../commandhandler/CommandHandler.java | 59 +
.../commandhandler/ContainerReportHandler.java | 114 ++
.../DeleteBlocksCommandHandler.java | 211 +++
.../commandhandler/package-info.java | 18 +
.../common/statemachine/package-info.java | 28 +
.../container/common/states/DatanodeState.java | 55 +
.../states/datanode/InitDatanodeState.java | 157 +++
.../states/datanode/RunningDatanodeState.java | 175 +++
.../common/states/datanode/package-info.java | 21 +
.../states/endpoint/HeartbeatEndpointTask.java | 267 ++++
.../states/endpoint/RegisterEndpointTask.java | 194 +++
.../states/endpoint/VersionEndpointTask.java | 68 +
.../common/states/endpoint/package-info.java | 20 +
.../container/common/states/package-info.java | 18 +
.../common/transport/server/XceiverServer.java | 130 ++
.../transport/server/XceiverServerHandler.java | 82 ++
.../server/XceiverServerInitializer.java | 62 +
.../transport/server/XceiverServerSpi.java | 43 +
.../common/transport/server/package-info.java | 24 +
.../server/ratis/ContainerStateMachine.java | 293 ++++
.../server/ratis/XceiverServerRatis.java | 214 +++
.../transport/server/ratis/package-info.java | 23 +
.../container/common/utils/ContainerCache.java | 168 +++
.../container/common/utils/package-info.java | 18 +
.../container/ozoneimpl/OzoneContainer.java | 277 ++++
.../ozone/container/ozoneimpl/package-info.java | 21 +
.../org/apache/hadoop/ozone/package-info.java | 23 +
.../StorageContainerDatanodeProtocol.java | 96 ++
.../protocol/StorageContainerNodeProtocol.java | 68 +
.../hadoop/ozone/protocol/VersionResponse.java | 150 ++
.../commands/CloseContainerCommand.java | 76 ++
.../protocol/commands/DeleteBlocksCommand.java | 66 +
.../protocol/commands/RegisteredCommand.java | 177 +++
.../protocol/commands/ReregisterCommand.java | 59 +
.../ozone/protocol/commands/SCMCommand.java | 41 +
.../protocol/commands/SendContainerCommand.java | 80 ++
.../ozone/protocol/commands/package-info.java | 21 +
.../hadoop/ozone/protocol/package-info.java | 23 +
...rDatanodeProtocolClientSideTranslatorPB.java | 204 +++
.../StorageContainerDatanodeProtocolPB.java | 34 +
...rDatanodeProtocolServerSideTranslatorPB.java | 119 ++
.../StorageContainerDatanodeProtocol.proto | 351 +++++
...m.sun.jersey.spi.container.ContainerProvider | 16 +
.../container/common/ContainerTestUtils.java | 68 +
.../ozone/container/common/SCMTestUtils.java | 120 ++
.../ozone/container/common/ScmTestMock.java | 274 ++++
.../common/TestDatanodeStateMachine.java | 381 ++++++
.../testutils/BlockDeletingServiceTestImpl.java | 104 ++
.../ozone/container/testutils/package-info.java | 18 +
hadoop-hdds/framework/README.md | 24 +
hadoop-hdds/framework/pom.xml | 89 ++
.../hadoop/hdsl/server/BaseHttpServer.java | 218 +++
.../apache/hadoop/hdsl/server/ServerUtils.java | 139 ++
.../hadoop/hdsl/server/ServiceRuntimeInfo.java | 64 +
.../hdsl/server/ServiceRuntimeInfoImpl.java | 55 +
.../apache/hadoop/hdsl/server/package-info.java | 23 +
.../src/main/resources/webapps/datanode/dn.js | 92 ++
.../webapps/static/angular-1.6.4.min.js | 332 +++++
.../webapps/static/angular-nvd3-1.0.9.min.js | 1 +
.../webapps/static/angular-route-1.6.4.min.js | 17 +
.../resources/webapps/static/d3-3.5.17.min.js | 5 +
.../main/resources/webapps/static/dfs-dust.js | 133 ++
.../resources/webapps/static/nvd3-1.8.5.min.css | 2 +
.../webapps/static/nvd3-1.8.5.min.css.map | 1 +
.../resources/webapps/static/nvd3-1.8.5.min.js | 11 +
.../webapps/static/nvd3-1.8.5.min.js.map | 1 +
.../src/main/resources/webapps/static/ozone.css | 60 +
.../src/main/resources/webapps/static/ozone.js | 355 +++++
.../webapps/static/templates/config.html | 91 ++
.../resources/webapps/static/templates/jvm.html | 26 +
.../webapps/static/templates/menu.html | 60 +
.../webapps/static/templates/overview.html | 39 +
.../webapps/static/templates/rpc-metrics.html | 87 ++
.../hadoop/hdsl/server/TestBaseHttpServer.java | 98 ++
.../framework/src/test/resources/ozone-site.xml | 24 +
hadoop-hdds/pom.xml | 98 ++
hadoop-hdds/server-scm/pom.xml | 154 +++
.../org/apache/hadoop/hdds/scm/SCMMXBean.java | 50 +
.../org/apache/hadoop/hdds/scm/SCMStorage.java | 73 +
.../hdds/scm/StorageContainerManager.java | 1290 ++++++++++++++++++
.../scm/StorageContainerManagerHttpServer.java | 76 ++
.../hadoop/hdds/scm/block/BlockManager.java | 86 ++
.../hadoop/hdds/scm/block/BlockManagerImpl.java | 530 +++++++
.../hdds/scm/block/BlockmanagerMXBean.java | 30 +
.../block/DatanodeDeletedBlockTransactions.java | 132 ++
.../hadoop/hdds/scm/block/DeletedBlockLog.java | 124 ++
.../hdds/scm/block/DeletedBlockLogImpl.java | 356 +++++
.../hdds/scm/block/SCMBlockDeletingService.java | 175 +++
.../hadoop/hdds/scm/block/package-info.java | 22 +
.../hdds/scm/container/ContainerMapping.java | 607 ++++++++
.../scm/container/ContainerStateManager.java | 456 +++++++
.../hadoop/hdds/scm/container/Mapping.java | 106 ++
.../scm/container/closer/ContainerCloser.java | 192 +++
.../hdds/scm/container/closer/package-info.java | 23 +
.../hadoop/hdds/scm/container/package-info.java | 22 +
.../algorithms/ContainerPlacementPolicy.java | 41 +
.../placement/algorithms/SCMCommonPolicy.java | 197 +++
.../SCMContainerPlacementCapacity.java | 133 ++
.../algorithms/SCMContainerPlacementRandom.java | 89 ++
.../placement/algorithms/package-info.java | 18 +
.../placement/metrics/ContainerStat.java | 165 +++
.../placement/metrics/DatanodeMetric.java | 91 ++
.../container/placement/metrics/LongMetric.java | 162 +++
.../container/placement/metrics/NodeStat.java | 67 +
.../container/placement/metrics/SCMMetrics.java | 154 +++
.../placement/metrics/SCMNodeMetric.java | 223 +++
.../placement/metrics/SCMNodeStat.java | 139 ++
.../placement/metrics/package-info.java | 20 +
.../scm/container/placement/package-info.java | 19 +
.../replication/ContainerSupervisor.java | 334 +++++
.../container/replication/InProgressPool.java | 313 +++++
.../scm/container/replication/PeriodicPool.java | 119 ++
.../scm/container/replication/package-info.java | 23 +
.../container/states/ContainerAttribute.java | 245 ++++
.../scm/container/states/ContainerState.java | 96 ++
.../scm/container/states/ContainerStateMap.java | 405 ++++++
.../hdds/scm/container/states/package-info.java | 22 +
.../hdds/scm/exceptions/SCMException.java | 119 ++
.../hdds/scm/exceptions/package-info.java | 18 +
.../hadoop/hdds/scm/node/CommandQueue.java | 190 +++
.../hdds/scm/node/HeartbeatQueueItem.java | 117 ++
.../hadoop/hdds/scm/node/NodeManager.java | 153 +++
.../hadoop/hdds/scm/node/NodeManagerMXBean.java | 57 +
.../hadoop/hdds/scm/node/NodePoolManager.java | 71 +
.../hadoop/hdds/scm/node/SCMNodeManager.java | 904 ++++++++++++
.../hdds/scm/node/SCMNodePoolManager.java | 269 ++++
.../hadoop/hdds/scm/node/package-info.java | 31 +
.../apache/hadoop/hdds/scm/package-info.java | 22 +
.../hdds/scm/pipelines/PipelineManager.java | 175 +++
.../hdds/scm/pipelines/PipelineSelector.java | 230 ++++
.../hadoop/hdds/scm/pipelines/package-info.java | 38 +
.../scm/pipelines/ratis/RatisManagerImpl.java | 158 +++
.../hdds/scm/pipelines/ratis/package-info.java | 18 +
.../standalone/StandaloneManagerImpl.java | 145 ++
.../scm/pipelines/standalone/package-info.java | 18 +
.../hadoop/hdds/scm/ratis/package-info.java | 22 +
.../server-scm/src/main/webapps/scm/index.html | 76 ++
.../server-scm/src/main/webapps/scm/main.html | 20 +
.../src/main/webapps/scm/scm-overview.html | 60 +
.../server-scm/src/main/webapps/scm/scm.js | 54 +
.../hadoop/hdds/scm/HddsServerUtilTest.java | 308 +++++
.../TestStorageContainerManagerHttpServer.java | 140 ++
.../org/apache/hadoop/hdds/scm/TestUtils.java | 111 ++
.../hadoop/hdds/scm/block/TestBlockManager.java | 160 +++
.../hdds/scm/block/TestDeletedBlockLog.java | 367 +++++
.../hdds/scm/container/MockNodeManager.java | 520 +++++++
.../scm/container/TestContainerMapping.java | 333 +++++
.../container/closer/TestContainerCloser.java | 228 ++++
.../states/TestContainerAttribute.java | 143 ++
.../hdds/scm/node/TestContainerPlacement.java | 176 +++
.../hadoop/hdds/scm/node/TestNodeManager.java | 1179 ++++++++++++++++
.../hdds/scm/node/TestSCMNodePoolManager.java | 160 +++
.../apache/hadoop/hdds/scm/package-info.java | 21 +
.../ozone/container/common/TestEndPoint.java | 460 +++++++
.../placement/TestContainerPlacement.java | 134 ++
.../placement/TestDatanodeMetrics.java | 59 +
.../replication/TestContainerSupervisor.java | 272 ++++
.../container/replication/package-info.java | 18 +
.../ReplicationDatanodeStateManager.java | 100 ++
.../testutils/ReplicationNodeManagerMock.java | 326 +++++
.../ReplicationNodePoolManagerMock.java | 133 ++
.../ozone/container/testutils/package-info.java | 18 +
hadoop-hdds/tools/pom.xml | 65 +
.../hadoop/hdds/scm/cli/OzoneBaseCLI.java | 43 +
.../hdds/scm/cli/OzoneCommandHandler.java | 87 ++
.../apache/hadoop/hdds/scm/cli/ResultCode.java | 31 +
.../org/apache/hadoop/hdds/scm/cli/SCMCLI.java | 233 ++++
.../cli/container/CloseContainerHandler.java | 82 ++
.../cli/container/ContainerCommandHandler.java | 129 ++
.../cli/container/CreateContainerHandler.java | 81 ++
.../cli/container/DeleteContainerHandler.java | 92 ++
.../scm/cli/container/InfoContainerHandler.java | 114 ++
.../scm/cli/container/ListContainerHandler.java | 121 ++
.../hdds/scm/cli/container/package-info.java | 19 +
.../hadoop/hdds/scm/cli/package-info.java | 19 +
hadoop-hdsl/client/pom.xml | 49 -
.../hadoop/ozone/client/OzoneClientUtils.java | 231 ----
.../hadoop/ozone/client/package-info.java | 23 -
.../org/apache/hadoop/scm/XceiverClient.java | 192 ---
.../apache/hadoop/scm/XceiverClientHandler.java | 204 ---
.../hadoop/scm/XceiverClientInitializer.java | 72 -
.../apache/hadoop/scm/XceiverClientManager.java | 219 ---
.../apache/hadoop/scm/XceiverClientMetrics.java | 92 --
.../apache/hadoop/scm/XceiverClientRatis.java | 264 ----
.../scm/client/ContainerOperationClient.java | 403 ------
.../apache/hadoop/scm/client/package-info.java | 23 -
.../org/apache/hadoop/scm/package-info.java | 23 -
.../hadoop/scm/storage/ChunkInputStream.java | 261 ----
.../hadoop/scm/storage/ChunkOutputStream.java | 227 ---
.../apache/hadoop/scm/storage/package-info.java | 23 -
.../common/dev-support/findbugsExcludeFile.xml | 21 -
hadoop-hdsl/common/pom.xml | 129 --
.../java/org/apache/hadoop/hdsl/HdslUtils.java | 273 ----
.../hadoop/hdsl/conf/OzoneConfiguration.java | 161 ---
.../apache/hadoop/hdsl/conf/package-info.java | 18 -
.../org/apache/hadoop/hdsl/package-info.java | 23 -
.../hadoop/hdsl/protocol/DatanodeDetails.java | 422 ------
.../hadoop/hdsl/protocol/package-info.java | 22 -
.../java/org/apache/hadoop/ozone/OzoneAcl.java | 231 ----
.../apache/hadoop/ozone/OzoneConfigKeys.java | 239 ----
.../org/apache/hadoop/ozone/OzoneConsts.java | 167 ---
.../apache/hadoop/ozone/client/OzoneQuota.java | 203 ---
.../hadoop/ozone/client/ReplicationFactor.java | 63 -
.../hadoop/ozone/client/ReplicationType.java | 28 -
.../hadoop/ozone/client/package-info.java | 23 -
.../apache/hadoop/ozone/common/BlockGroup.java | 87 --
.../ozone/common/DeleteBlockGroupResult.java | 94 --
.../InconsistentStorageStateException.java | 51 -
.../org/apache/hadoop/ozone/common/Storage.java | 249 ----
.../apache/hadoop/ozone/common/StorageInfo.java | 184 ---
.../hadoop/ozone/common/package-info.java | 18 -
.../InvalidStateTransitionException.java | 42 -
.../ozone/common/statemachine/StateMachine.java | 68 -
.../ozone/common/statemachine/package-info.java | 21 -
.../container/common/helpers/ChunkInfo.java | 185 ---
.../ozone/container/common/helpers/KeyData.java | 170 ---
.../container/common/helpers/package-info.java | 23 -
.../org/apache/hadoop/ozone/lease/Lease.java | 189 ---
.../ozone/lease/LeaseAlreadyExistException.java | 46 -
.../ozone/lease/LeaseCallbackExecutor.java | 65 -
.../hadoop/ozone/lease/LeaseException.java | 45 -
.../ozone/lease/LeaseExpiredException.java | 45 -
.../apache/hadoop/ozone/lease/LeaseManager.java | 247 ----
.../lease/LeaseManagerNotRunningException.java | 45 -
.../ozone/lease/LeaseNotFoundException.java | 46 -
.../apache/hadoop/ozone/lease/package-info.java | 26 -
.../org/apache/hadoop/ozone/package-info.java | 35 -
...kLocationProtocolServerSideTranslatorPB.java | 169 ---
...rLocationProtocolServerSideTranslatorPB.java | 202 ---
.../hadoop/ozone/protocolPB/package-info.java | 24 -
.../hadoop/ozone/web/utils/JsonUtils.java | 71 -
.../org/apache/hadoop/scm/ScmConfigKeys.java | 271 ----
.../java/org/apache/hadoop/scm/ScmInfo.java | 81 --
.../org/apache/hadoop/scm/XceiverClientSpi.java | 129 --
.../org/apache/hadoop/scm/client/ScmClient.java | 139 --
.../apache/hadoop/scm/client/package-info.java | 24 -
.../container/ContainerStates/ContainerID.java | 97 --
.../container/ContainerStates/package-info.java | 22 -
.../common/helpers/AllocatedBlock.java | 77 --
.../container/common/helpers/ContainerInfo.java | 333 -----
.../common/helpers/DeleteBlockResult.java | 52 -
.../scm/container/common/helpers/Pipeline.java | 253 ----
.../common/helpers/PipelineChannel.java | 122 --
.../helpers/StorageContainerException.java | 104 --
.../container/common/helpers/package-info.java | 22 -
.../org/apache/hadoop/scm/package-info.java | 24 -
.../hadoop/scm/protocol/LocatedContainer.java | 127 --
.../scm/protocol/ScmBlockLocationProtocol.java | 72 -
.../hadoop/scm/protocol/ScmLocatedBlock.java | 100 --
.../StorageContainerLocationProtocol.java | 123 --
.../hadoop/scm/protocol/package-info.java | 19 -
...kLocationProtocolClientSideTranslatorPB.java | 207 ---
.../protocolPB/ScmBlockLocationProtocolPB.java | 35 -
...rLocationProtocolClientSideTranslatorPB.java | 304 -----
.../StorageContainerLocationProtocolPB.java | 34 -
.../hadoop/scm/protocolPB/package-info.java | 24 -
.../scm/storage/ContainerProtocolCalls.java | 397 ------
.../apache/hadoop/scm/storage/package-info.java | 23 -
.../apache/hadoop/utils/BackgroundService.java | 161 ---
.../org/apache/hadoop/utils/BackgroundTask.java | 28 -
.../hadoop/utils/BackgroundTaskQueue.java | 64 -
.../hadoop/utils/BackgroundTaskResult.java | 44 -
.../org/apache/hadoop/utils/BatchOperation.java | 90 --
.../org/apache/hadoop/utils/EntryConsumer.java | 38 -
.../org/apache/hadoop/utils/LevelDBStore.java | 380 ------
.../apache/hadoop/utils/MetadataKeyFilters.java | 118 --
.../org/apache/hadoop/utils/MetadataStore.java | 172 ---
.../hadoop/utils/MetadataStoreBuilder.java | 125 --
.../org/apache/hadoop/utils/RocksDBStore.java | 382 ------
.../apache/hadoop/utils/RocksDBStoreMBean.java | 136 --
.../org/apache/hadoop/utils/package-info.java | 18 -
.../main/java/org/apache/ratis/RatisHelper.java | 129 --
.../java/org/apache/ratis/package-info.java | 22 -
.../com/google/protobuf/ShadedProtoUtil.java | 38 -
.../com/google/protobuf/package-info.java | 22 -
.../main/proto/DatanodeContainerProtocol.proto | 415 ------
.../main/proto/ScmBlockLocationProtocol.proto | 166 ---
.../StorageContainerLocationProtocol.proto | 214 ---
hadoop-hdsl/common/src/main/proto/hdsl.proto | 172 ---
.../common/src/main/resources/ozone-default.xml | 1031 --------------
.../apache/hadoop/ozone/TestMetadataStore.java | 414 ------
.../org/apache/hadoop/ozone/TestOzoneAcls.java | 141 --
.../hadoop/ozone/common/TestStateMachine.java | 104 --
.../hadoop/ozone/lease/TestLeaseManager.java | 374 -----
.../apache/hadoop/ozone/lease/package-info.java | 21 -
.../org/apache/hadoop/ozone/package-info.java | 21 -
.../java/org/apache/hadoop/scm/TestArchive.java | 114 --
.../org/apache/hadoop/scm/package-info.java | 21 -
.../hadoop/utils/TestRocksDBStoreMBean.java | 87 --
hadoop-hdsl/container-service/pom.xml | 98 --
.../hadoop/ozone/HdslDatanodeService.java | 140 --
.../container/common/helpers/ChunkUtils.java | 345 -----
.../container/common/helpers/ContainerData.java | 326 -----
.../common/helpers/ContainerMetrics.java | 121 --
.../common/helpers/ContainerReport.java | 218 ---
.../common/helpers/ContainerUtils.java | 441 ------
.../helpers/DeletedContainerBlocksSummary.java | 103 --
.../container/common/helpers/FileUtils.java | 81 --
.../container/common/helpers/KeyUtils.java | 147 --
.../container/common/helpers/package-info.java | 22 -
.../container/common/impl/ChunkManagerImpl.java | 232 ----
.../impl/ContainerLocationManagerImpl.java | 92 --
.../common/impl/ContainerReportManagerImpl.java | 89 --
.../container/common/impl/ContainerStatus.java | 217 ---
.../common/impl/ContainerStorageLocation.java | 203 ---
.../ozone/container/common/impl/Dispatcher.java | 708 ----------
.../container/common/impl/KeyManagerImpl.java | 201 ---
.../RandomContainerDeletionChoosingPolicy.java | 69 -
.../common/impl/StorageLocationReport.java | 63 -
...NOrderedContainerDeletionChoosingPolicy.java | 90 --
.../container/common/impl/package-info.java | 22 -
.../common/interfaces/ChunkManager.java | 75 -
.../ContainerDeletionChoosingPolicy.java | 45 -
.../common/interfaces/ContainerDispatcher.java | 49 -
.../interfaces/ContainerLocationManager.java | 58 -
.../ContainerLocationManagerMXBean.java | 36 -
.../common/interfaces/ContainerManager.java | 277 ----
.../interfaces/ContainerReportManager.java | 32 -
.../container/common/interfaces/KeyManager.java | 75 -
.../common/interfaces/package-info.java | 20 -
.../ozone/container/common/package-info.java | 28 -
.../statemachine/DatanodeStateMachine.java | 384 ------
.../statemachine/EndpointStateMachine.java | 295 ----
.../statemachine/EndpointStateMachineMBean.java | 34 -
.../statemachine/SCMConnectionManager.java | 203 ---
.../SCMConnectionManagerMXBean.java | 27 -
.../common/statemachine/StateContext.java | 281 ----
.../background/BlockDeletingService.java | 238 ----
.../statemachine/background/package-info.java | 18 -
.../commandhandler/CloseContainerHandler.java | 112 --
.../commandhandler/CommandDispatcher.java | 177 ---
.../commandhandler/CommandHandler.java | 59 -
.../commandhandler/ContainerReportHandler.java | 110 --
.../DeleteBlocksCommandHandler.java | 204 ---
.../commandhandler/package-info.java | 18 -
.../common/statemachine/package-info.java | 28 -
.../container/common/states/DatanodeState.java | 55 -
.../states/datanode/InitDatanodeState.java | 157 ---
.../states/datanode/RunningDatanodeState.java | 175 ---
.../common/states/datanode/package-info.java | 21 -
.../states/endpoint/HeartbeatEndpointTask.java | 267 ----
.../states/endpoint/RegisterEndpointTask.java | 195 ---
.../states/endpoint/VersionEndpointTask.java | 66 -
.../common/states/endpoint/package-info.java | 20 -
.../container/common/states/package-info.java | 18 -
.../common/transport/server/XceiverServer.java | 130 --
.../transport/server/XceiverServerHandler.java | 80 --
.../server/XceiverServerInitializer.java | 61 -
.../transport/server/XceiverServerSpi.java | 43 -
.../common/transport/server/package-info.java | 24 -
.../server/ratis/ContainerStateMachine.java | 290 ----
.../server/ratis/XceiverServerRatis.java | 215 ---
.../transport/server/ratis/package-info.java | 23 -
.../container/common/utils/ContainerCache.java | 168 ---
.../container/common/utils/package-info.java | 18 -
.../container/ozoneimpl/OzoneContainer.java | 270 ----
.../ozone/container/ozoneimpl/package-info.java | 21 -
.../org/apache/hadoop/ozone/package-info.java | 23 -
.../StorageContainerDatanodeProtocol.java | 84 --
.../protocol/StorageContainerNodeProtocol.java | 68 -
.../hadoop/ozone/protocol/VersionResponse.java | 150 --
.../commands/CloseContainerCommand.java | 75 -
.../protocol/commands/DeleteBlocksCommand.java | 63 -
.../protocol/commands/RegisteredCommand.java | 177 ---
.../protocol/commands/ReregisterCommand.java | 58 -
.../ozone/protocol/commands/SCMCommand.java | 41 -
.../protocol/commands/SendContainerCommand.java | 80 --
.../ozone/protocol/commands/package-info.java | 21 -
.../hadoop/ozone/protocol/package-info.java | 23 -
...rDatanodeProtocolClientSideTranslatorPB.java | 197 ---
.../StorageContainerDatanodeProtocolPB.java | 32 -
...rDatanodeProtocolServerSideTranslatorPB.java | 111 --
.../apache/hadoop/ozone/scm/HdslServerUtil.java | 304 -----
.../apache/hadoop/ozone/scm/VersionInfo.java | 81 --
.../StorageContainerDatanodeProtocol.proto | 351 -----
...m.sun.jersey.spi.container.ContainerProvider | 16 -
.../container/common/ContainerTestUtils.java | 68 -
.../ozone/container/common/SCMTestUtils.java | 121 --
.../ozone/container/common/ScmTestMock.java | 265 ----
.../common/TestDatanodeStateMachine.java | 375 -----
.../testutils/BlockDeletingServiceTestImpl.java | 103 --
.../ozone/container/testutils/package-info.java | 18 -
hadoop-hdsl/framework/README.md | 24 -
hadoop-hdsl/framework/pom.xml | 91 --
.../hadoop/hdsl/server/BaseHttpServer.java | 218 ---
.../apache/hadoop/hdsl/server/ServerUtils.java | 140 --
.../hadoop/hdsl/server/ServiceRuntimeInfo.java | 64 -
.../hdsl/server/ServiceRuntimeInfoImpl.java | 55 -
.../apache/hadoop/hdsl/server/package-info.java | 23 -
.../src/main/resources/webapps/datanode/dn.js | 92 --
.../webapps/static/angular-1.6.4.min.js | 332 -----
.../webapps/static/angular-nvd3-1.0.9.min.js | 1 -
.../webapps/static/angular-route-1.6.4.min.js | 17 -
.../resources/webapps/static/d3-3.5.17.min.js | 5 -
.../main/resources/webapps/static/dfs-dust.js | 133 --
.../resources/webapps/static/nvd3-1.8.5.min.css | 2 -
.../webapps/static/nvd3-1.8.5.min.css.map | 1 -
.../resources/webapps/static/nvd3-1.8.5.min.js | 11 -
.../webapps/static/nvd3-1.8.5.min.js.map | 1 -
.../src/main/resources/webapps/static/ozone.css | 60 -
.../src/main/resources/webapps/static/ozone.js | 355 -----
.../webapps/static/templates/config.html | 91 --
.../resources/webapps/static/templates/jvm.html | 26 -
.../webapps/static/templates/menu.html | 60 -
.../webapps/static/templates/overview.html | 39 -
.../webapps/static/templates/rpc-metrics.html | 87 --
.../hadoop/hdsl/server/TestBaseHttpServer.java | 99 --
.../framework/src/test/resources/ozone-site.xml | 24 -
hadoop-hdsl/pom.xml | 97 --
hadoop-hdsl/server-scm/pom.xml | 154 ---
.../org/apache/hadoop/ozone/scm/SCMMXBean.java | 50 -
.../org/apache/hadoop/ozone/scm/SCMStorage.java | 73 -
.../ozone/scm/StorageContainerManager.java | 1272 -----------------
.../scm/StorageContainerManagerHttpServer.java | 77 --
.../hadoop/ozone/scm/block/BlockManager.java | 86 --
.../ozone/scm/block/BlockManagerImpl.java | 531 -------
.../ozone/scm/block/BlockmanagerMXBean.java | 30 -
.../block/DatanodeDeletedBlockTransactions.java | 132 --
.../hadoop/ozone/scm/block/DeletedBlockLog.java | 124 --
.../ozone/scm/block/DeletedBlockLogImpl.java | 352 -----
.../scm/block/SCMBlockDeletingService.java | 173 ---
.../hadoop/ozone/scm/block/package-info.java | 22 -
.../ozone/scm/container/ContainerMapping.java | 607 --------
.../scm/container/ContainerStateManager.java | 456 -------
.../ContainerStates/ContainerAttribute.java | 244 ----
.../ContainerStates/ContainerState.java | 96 --
.../ContainerStates/ContainerStateMap.java | 404 ------
.../container/ContainerStates/package-info.java | 22 -
.../hadoop/ozone/scm/container/Mapping.java | 107 --
.../scm/container/closer/ContainerCloser.java | 192 ---
.../scm/container/closer/package-info.java | 23 -
.../ozone/scm/container/package-info.java | 22 -
.../algorithms/ContainerPlacementPolicy.java | 41 -
.../placement/algorithms/SCMCommonPolicy.java | 197 ---
.../SCMContainerPlacementCapacity.java | 133 --
.../algorithms/SCMContainerPlacementRandom.java | 89 --
.../placement/algorithms/package-info.java | 18 -
.../placement/metrics/ContainerStat.java | 166 ---
.../placement/metrics/DatanodeMetric.java | 91 --
.../container/placement/metrics/LongMetric.java | 162 ---
.../container/placement/metrics/NodeStat.java | 67 -
.../container/placement/metrics/SCMMetrics.java | 154 ---
.../placement/metrics/SCMNodeMetric.java | 223 ---
.../placement/metrics/SCMNodeStat.java | 139 --
.../placement/metrics/package-info.java | 20 -
.../scm/container/placement/package-info.java | 19 -
.../replication/ContainerSupervisor.java | 334 -----
.../container/replication/InProgressPool.java | 314 -----
.../scm/container/replication/PeriodicPool.java | 119 --
.../scm/container/replication/package-info.java | 23 -
.../ozone/scm/exceptions/SCMException.java | 119 --
.../ozone/scm/exceptions/package-info.java | 18 -
.../hadoop/ozone/scm/node/CommandQueue.java | 190 ---
.../ozone/scm/node/HeartbeatQueueItem.java | 116 --
.../hadoop/ozone/scm/node/NodeManager.java | 153 ---
.../ozone/scm/node/NodeManagerMXBean.java | 57 -
.../hadoop/ozone/scm/node/NodePoolManager.java | 72 -
.../hadoop/ozone/scm/node/SCMNodeManager.java | 910 ------------
.../ozone/scm/node/SCMNodePoolManager.java | 270 ----
.../hadoop/ozone/scm/node/package-info.java | 31 -
.../apache/hadoop/ozone/scm/package-info.java | 22 -
.../ozone/scm/pipelines/PipelineManager.java | 176 ---
.../ozone/scm/pipelines/PipelineSelector.java | 228 ----
.../ozone/scm/pipelines/package-info.java | 38 -
.../scm/pipelines/ratis/RatisManagerImpl.java | 158 ---
.../ozone/scm/pipelines/ratis/package-info.java | 18 -
.../standalone/StandaloneManagerImpl.java | 144 --
.../scm/pipelines/standalone/package-info.java | 18 -
.../hadoop/ozone/scm/ratis/package-info.java | 22 -
.../server-scm/src/main/webapps/scm/index.html | 76 --
.../server-scm/src/main/webapps/scm/main.html | 20 -
.../src/main/webapps/scm/scm-overview.html | 60 -
.../server-scm/src/main/webapps/scm/scm.js | 54 -
.../ozone/container/common/TestEndPoint.java | 463 -------
.../placement/TestContainerPlacement.java | 131 --
.../placement/TestDatanodeMetrics.java | 59 -
.../replication/TestContainerSupervisor.java | 269 ----
.../container/replication/package-info.java | 18 -
.../ReplicationDatanodeStateManager.java | 97 --
.../testutils/ReplicationNodeManagerMock.java | 327 -----
.../ReplicationNodePoolManagerMock.java | 133 --
.../ozone/container/testutils/package-info.java | 18 -
.../hadoop/ozone/scm/HdslServerUtilTest.java | 315 -----
.../TestStorageContainerManagerHttpServer.java | 141 --
.../org/apache/hadoop/ozone/scm/TestUtils.java | 111 --
.../ozone/scm/block/TestBlockManager.java | 160 ---
.../ozone/scm/block/TestDeletedBlockLog.java | 366 -----
.../ContainerStates/TestContainerAttribute.java | 142 --
.../ozone/scm/container/MockNodeManager.java | 523 -------
.../scm/container/TestContainerMapping.java | 335 -----
.../container/closer/TestContainerCloser.java | 221 ---
.../ozone/scm/node/TestContainerPlacement.java | 172 ---
.../hadoop/ozone/scm/node/TestNodeManager.java | 1179 ----------------
.../ozone/scm/node/TestSCMNodePoolManager.java | 159 ---
.../apache/hadoop/ozone/scm/package-info.java | 21 -
hadoop-hdsl/tools/pom.xml | 64 -
.../hadoop/ozone/scm/cli/OzoneBaseCLI.java | 43 -
.../ozone/scm/cli/OzoneCommandHandler.java | 87 --
.../apache/hadoop/ozone/scm/cli/ResultCode.java | 31 -
.../org/apache/hadoop/ozone/scm/cli/SCMCLI.java | 230 ----
.../cli/container/CloseContainerHandler.java | 84 --
.../cli/container/ContainerCommandHandler.java | 128 --
.../cli/container/CreateContainerHandler.java | 81 --
.../cli/container/DeleteContainerHandler.java | 92 --
.../scm/cli/container/InfoContainerHandler.java | 115 --
.../scm/cli/container/ListContainerHandler.java | 121 --
.../ozone/scm/cli/container/package-info.java | 19 -
.../hadoop/ozone/scm/cli/package-info.java | 19 -
hadoop-ozone/acceptance-test/README.md | 2 +-
.../src/test/compose/docker-config | 2 +-
.../apache/hadoop/ozone/client/ObjectStore.java | 11 +-
.../apache/hadoop/ozone/client/OzoneBucket.java | 5 +-
.../hadoop/ozone/client/OzoneClientFactory.java | 2 +-
.../apache/hadoop/ozone/client/OzoneVolume.java | 14 +-
.../ozone/client/io/ChunkGroupInputStream.java | 14 +-
.../ozone/client/io/ChunkGroupOutputStream.java | 22 +-
.../client/io/OzoneContainerTranslation.java | 2 +-
.../ozone/client/io/OzoneInputStream.java | 2 +-
.../ozone/client/protocol/ClientProtocol.java | 6 +-
.../hadoop/ozone/client/rest/RestClient.java | 22 +-
.../hadoop/ozone/client/rpc/RpcClient.java | 28 +-
.../hadoop/ozone/web/client/OzoneBucket.java | 19 +-
.../ozone/web/client/OzoneRestClient.java | 12 +-
.../hadoop/ozone/web/client/OzoneVolume.java | 6 +-
.../ozone/client/TestHddsClientUtils.java | 105 ++
.../ozone/client/TestOzoneClientUtils.java | 105 --
hadoop-ozone/common/pom.xml | 2 +-
hadoop-ozone/common/src/main/bin/oz | 2 +-
.../java/org/apache/hadoop/ozone/KsmUtils.java | 4 +-
.../ozone/client/rest/response/VolumeInfo.java | 2 +-
.../apache/hadoop/ozone/freon/OzoneGetConf.java | 6 +-
.../hadoop/ozone/ksm/helpers/KsmKeyArgs.java | 4 +-
.../hadoop/ozone/ksm/helpers/KsmVolumeArgs.java | 2 +-
.../hadoop/ozone/ksm/helpers/ServiceInfo.java | 2 +-
.../hadoop/ozone/web/utils/OzoneUtils.java | 6 +-
.../main/proto/KeySpaceManagerProtocol.proto | 10 +-
.../src/main/shellprofile.d/hadoop-ozone.sh | 12 +-
.../container/TestContainerStateManager.java | 306 +++++
.../hadoop/ozone/MiniOzoneClassicCluster.java | 24 +-
.../apache/hadoop/ozone/MiniOzoneCluster.java | 4 +-
.../hadoop/ozone/MiniOzoneTestHelper.java | 14 +-
.../apache/hadoop/ozone/RatisTestHelper.java | 2 +-
.../hadoop/ozone/TestContainerOperations.java | 26 +-
.../hadoop/ozone/TestMiniOzoneCluster.java | 24 +-
.../ozone/TestOzoneConfigurationFields.java | 2 +-
.../ozone/TestStorageContainerManager.java | 41 +-
.../TestStorageContainerManagerHelper.java | 4 +-
.../ozone/client/rest/TestOzoneRestClient.java | 8 +-
.../ozone/client/rpc/TestOzoneRpcClient.java | 24 +-
.../ozone/container/ContainerTestHelper.java | 22 +-
.../common/TestBlockDeletingService.java | 8 +-
.../TestContainerDeletionChoosingPolicy.java | 8 +-
.../common/impl/TestContainerPersistence.java | 12 +-
.../TestCloseContainerHandler.java | 18 +-
.../container/metrics/TestContainerMetrics.java | 16 +-
.../container/ozoneimpl/TestOzoneContainer.java | 12 +-
.../ozoneimpl/TestOzoneContainerRatis.java | 6 +-
.../container/ozoneimpl/TestRatisManager.java | 4 +-
.../container/server/TestContainerServer.java | 21 +-
.../hadoop/ozone/freon/TestDataValidate.java | 2 +-
.../apache/hadoop/ozone/freon/TestFreon.java | 2 +-
.../ozone/ksm/TestContainerReportWithKeys.java | 16 +-
.../apache/hadoop/ozone/ksm/TestKSMMetrcis.java | 2 +-
.../apache/hadoop/ozone/ksm/TestKSMSQLCli.java | 4 +-
.../hadoop/ozone/ksm/TestKeySpaceManager.java | 17 +-
.../ksm/TestKeySpaceManagerRestInterface.java | 14 +-
.../ozone/ksm/TestKsmBlockVersioning.java | 2 +-
.../ksm/TestMultipleContainerReadWrite.java | 4 +-
.../hadoop/ozone/ozShell/TestOzoneShell.java | 2 +-
.../hadoop/ozone/scm/TestAllocateContainer.java | 8 +-
.../hadoop/ozone/scm/TestContainerSQLCli.java | 39 +-
.../ozone/scm/TestContainerSmallFile.java | 30 +-
.../org/apache/hadoop/ozone/scm/TestSCMCli.java | 42 +-
.../apache/hadoop/ozone/scm/TestSCMMXBean.java | 7 +-
.../apache/hadoop/ozone/scm/TestSCMMetrics.java | 16 +-
.../ozone/scm/TestXceiverClientManager.java | 20 +-
.../ozone/scm/TestXceiverClientMetrics.java | 18 +-
.../container/TestContainerStateManager.java | 303 ----
.../hadoop/ozone/scm/node/TestQueryNode.java | 39 +-
.../ozone/web/TestDistributedOzoneVolumes.java | 2 +-
.../hadoop/ozone/web/TestLocalOzoneVolumes.java | 2 +-
.../ozone/web/TestOzoneRestWithMiniCluster.java | 2 +-
.../hadoop/ozone/web/TestOzoneWebAccess.java | 2 +-
.../hadoop/ozone/web/client/TestBuckets.java | 2 +-
.../hadoop/ozone/web/client/TestKeys.java | 4 +-
.../ozone/web/client/TestOzoneClient.java | 2 +-
.../hadoop/ozone/web/client/TestVolume.java | 6 +-
.../ozone/web/client/TestVolumeRatis.java | 2 +-
.../server/datanode/ObjectStoreHandler.java | 14 +-
.../org/apache/hadoop/ozone/OzoneRestUtils.java | 4 +-
.../hadoop/ozone/web/ObjectStoreRestPlugin.java | 12 +-
.../web/handlers/StorageHandlerBuilder.java | 2 +-
.../web/netty/ObjectStoreRestHttpServer.java | 36 +-
.../web/storage/DistributedStorageHandler.java | 22 +-
hadoop-ozone/ozone-manager/pom.xml | 2 +-
.../org/apache/hadoop/ozone/ksm/KSMMXBean.java | 2 +-
.../ozone/ksm/KSMMetadataManagerImpl.java | 4 +-
.../org/apache/hadoop/ozone/ksm/KSMStorage.java | 6 +-
.../hadoop/ozone/ksm/KeyDeletingService.java | 2 +-
.../apache/hadoop/ozone/ksm/KeyManagerImpl.java | 14 +-
.../hadoop/ozone/ksm/KeySpaceManager.java | 46 +-
.../ozone/ksm/KeySpaceManagerHttpServer.java | 2 +-
.../hadoop/ozone/ksm/OpenKeyCleanupService.java | 2 +-
.../hadoop/ozone/ksm/VolumeManagerImpl.java | 8 +-
...ceManagerProtocolServerSideTranslatorPB.java | 14 +-
.../apache/hadoop/ozone/web/ozShell/Shell.java | 2 +-
.../hadoop/ozone/ksm/TestChunkStreams.java | 2 +-
.../ksm/TestKeySpaceManagerHttpServer.java | 2 +-
hadoop-ozone/pom.xml | 16 +-
hadoop-ozone/tools/pom.xml | 6 +-
.../org/apache/hadoop/ozone/freon/Freon.java | 5 +-
.../genesis/BenchMarkContainerStateMap.java | 22 +-
.../genesis/BenchMarkDatanodeDispatcher.java | 32 +-
.../apache/hadoop/ozone/genesis/Genesis.java | 2 +-
.../hadoop/ozone/genesis/GenesisUtil.java | 2 +-
.../org/apache/hadoop/ozone/scm/cli/SQLCLI.java | 18 +-
.../hadoop/ozone/scm/cli/package-info.java | 2 +-
hadoop-project/pom.xml | 16 +-
hadoop-tools/hadoop-ozone/pom.xml | 2 +-
.../apache/hadoop/fs/ozone/OzoneFileSystem.java | 4 +-
.../hadoop/fs/ozone/TestOzoneFSInputStream.java | 2 +-
.../hadoop/fs/ozone/contract/OzoneContract.java | 2 +-
hadoop-tools/hadoop-tools-dist/pom.xml | 2 +-
hadoop-tools/pom.xml | 2 +-
pom.xml | 14 +-
817 files changed, 48829 insertions(+), 47628 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
----------------------------------------------------------------------
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
index bafa12b..634c526 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
@@ -51,7 +51,7 @@
<exclude>**/file:/**</exclude>
<exclude>**/SecurityAuth.audit*</exclude>
<exclude>hadoop-ozone/**</exclude>
- <exclude>hadoop-hdsl/**</exclude>
+ <exclude>hadoop-hdds/**</exclude>
<exclude>hadoop-cblock/**</exclude>
</excludes>
</fileSet>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/pom.xml b/hadoop-cblock/server/pom.xml
index 3fa197d..8039dad 100644
--- a/hadoop-cblock/server/pom.xml
+++ b/hadoop-cblock/server/pom.xml
@@ -37,7 +37,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdsl-server-framework</artifactId>
+ <artifactId>hadoop-hdds-server-framework</artifactId>
</dependency>
<dependency>
@@ -47,12 +47,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdsl-common</artifactId>
+ <artifactId>hadoop-hdds-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdsl-client</artifactId>
+ <artifactId>hadoop-hdds-client</artifactId>
</dependency>
<dependency>
@@ -132,7 +132,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
${basedir}/../../hadoop-hdfs-project/hadoop-hdfs/src/main/proto/
</param>
<param>
- ${basedir}/../../hadoop-hdsl/common/src/main/proto/
+ ${basedir}/../../hadoop-hdds/common/src/main/proto/
</param>
<param>${basedir}/src/main/proto</param>
</imports>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CBlockManager.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CBlockManager.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CBlockManager.java
index 12b505a..9318b6c 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CBlockManager.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CBlockManager.java
@@ -37,24 +37,24 @@ import org.apache.hadoop.cblock.protocolPB
import org.apache.hadoop.ipc.Client;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.scm.XceiverClientManager;
-import org.apache.hadoop.scm.client.ContainerOperationClient;
-import org.apache.hadoop.scm.client.ScmClient;
+import org.apache.hadoop.hdds.scm.XceiverClientManager;
+import org.apache.hadoop.hdds.scm.client.ContainerOperationClient;
+import org.apache.hadoop.hdds.scm.client.ScmClient;
import org.apache.hadoop.cblock.storage.StorageManager;
import org.apache.hadoop.cblock.util.KeyUtil;
import org.apache.hadoop.ipc.ProtobufRpcEngine;
import org.apache.hadoop.ipc.RPC;
import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
-import org.apache.hadoop.scm.protocolPB
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.scm.protocolPB
.StorageContainerLocationProtocolClientSideTranslatorPB;
-import org.apache.hadoop.scm.protocolPB.StorageContainerLocationProtocolPB;
+import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolPB;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.utils.LevelDBStore;
import static org.apache.hadoop.cblock.CblockUtils.getCblockServerRpcAddr;
import static org.apache.hadoop.cblock.CblockUtils.getCblockServiceRpcAddr;
-import static org.apache.hadoop.hdsl.server.ServerUtils
+import static org.apache.hadoop.hdds.server.ServerUtils
.updateRPCListenAddress;
import org.iq80.leveldb.DBIterator;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CblockUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CblockUtils.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CblockUtils.java
index 99ffde0..f0f1d05 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CblockUtils.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/CblockUtils.java
@@ -36,8 +36,8 @@ import static org.apache.hadoop.cblock.CBlockConfigKeys
.DFS_CBLOCK_SERVICERPC_HOSTNAME_DEFAULT;
import static org.apache.hadoop.cblock.CBlockConfigKeys
.DFS_CBLOCK_SERVICERPC_PORT_DEFAULT;
-import static org.apache.hadoop.hdsl.HdslUtils.getHostNameFromConfigKeys;
-import static org.apache.hadoop.hdsl.HdslUtils.getPortNumberFromConfigKeys;
+import static org.apache.hadoop.hdds.HddsUtils.getHostNameFromConfigKeys;
+import static org.apache.hadoop.hdds.HddsUtils.getPortNumberFromConfigKeys;
/**
* Generic stateless utility functions for CBlock components.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/client/CBlockVolumeClient.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/client/CBlockVolumeClient.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/client/CBlockVolumeClient.java
index 4a3878a..9227a28 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/client/CBlockVolumeClient.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/client/CBlockVolumeClient.java
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.hadoop.cblock.CBlockConfigKeys;
import org.apache.hadoop.cblock.meta.VolumeInfo;
import org.apache.hadoop.cblock.protocolPB.CBlockServiceProtocolPB;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.ipc.RPC;
import org.apache.hadoop.net.NetUtils;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/BlockWriterTask.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/BlockWriterTask.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/BlockWriterTask.java
index 04fe3a4..f2d289e 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/BlockWriterTask.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/BlockWriterTask.java
@@ -21,9 +21,9 @@ import com.google.common.base.Preconditions;
import com.google.common.primitives.Longs;
import org.apache.hadoop.cblock.jscsiHelper.cache.LogicalBlock;
import org.apache.hadoop.cblock.jscsiHelper.cache.impl.AsyncBlockWriter;
-import org.apache.hadoop.scm.XceiverClientSpi;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
-import org.apache.hadoop.scm.storage.ContainerProtocolCalls;
+import org.apache.hadoop.hdds.scm.XceiverClientSpi;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.utils.LevelDBStore;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockClientProtocolClientSideTranslatorPB.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockClientProtocolClientSideTranslatorPB.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockClientProtocolClientSideTranslatorPB.java
index 84b68e3..0b6c5f3 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockClientProtocolClientSideTranslatorPB.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockClientProtocolClientSideTranslatorPB.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.cblock.protocolPB.CBlockClientServerProtocolPB;
import org.apache.hadoop.ipc.ProtobufHelper;
import org.apache.hadoop.ipc.ProtocolTranslator;
import org.apache.hadoop.ipc.RPC;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import java.io.Closeable;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockIStorageImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockIStorageImpl.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockIStorageImpl.java
index 2f35668..4744968 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockIStorageImpl.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockIStorageImpl.java
@@ -23,8 +23,8 @@ import org.apache.hadoop.cblock.jscsiHelper.cache.CacheModule;
import org.apache.hadoop.cblock.jscsiHelper.cache.LogicalBlock;
import org.apache.hadoop.cblock.jscsiHelper.cache.impl.CBlockLocalCache;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.scm.XceiverClientManager;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.XceiverClientManager;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import org.jscsi.target.storage.IStorageModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockTargetServer.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockTargetServer.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockTargetServer.java
index 75e013e..afbd260 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockTargetServer.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/CBlockTargetServer.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.cblock.jscsiHelper;
import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.cblock.proto.MountVolumeResponse;
import org.apache.hadoop.cblock.util.KeyUtil;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
-import org.apache.hadoop.scm.XceiverClientManager;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.scm.XceiverClientManager;
import org.jscsi.target.Configuration;
import org.jscsi.target.Target;
import org.jscsi.target.TargetServer;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/ContainerCacheFlusher.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/ContainerCacheFlusher.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/ContainerCacheFlusher.java
index 292662e..171f3e2 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/ContainerCacheFlusher.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/ContainerCacheFlusher.java
@@ -26,8 +26,8 @@ import org.apache.hadoop.cblock.jscsiHelper.cache.impl.AsyncBlockWriter;
import org.apache.hadoop.cblock.jscsiHelper.cache.impl.DiskBlock;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.scm.XceiverClientManager;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.XceiverClientManager;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.utils.LevelDBStore;
import org.iq80.leveldb.Options;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java
index f164f38..3806d8b 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java
@@ -31,9 +31,9 @@ import org.apache.hadoop.ipc.ProtobufRpcEngine;
import org.apache.hadoop.ipc.RPC;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.scm.client.ContainerOperationClient;
+import org.apache.hadoop.hdds.scm.client.ContainerOperationClient;
import org.apache.hadoop.security.UserGroupInformation;
import org.jscsi.target.Configuration;
@@ -47,14 +47,14 @@ import static org.apache.hadoop.cblock.CBlockConfigKeys.DFS_CBLOCK_JSCSI_PORT_DE
import static org.apache.hadoop.cblock.CBlockConfigKeys.DFS_CBLOCK_JSCSI_PORT_KEY;
import static org.apache.hadoop.cblock.CBlockConfigKeys.DFS_CBLOCK_JSCSI_SERVER_ADDRESS_DEFAULT;
import static org.apache.hadoop.cblock.CBlockConfigKeys.DFS_CBLOCK_JSCSI_SERVER_ADDRESS_KEY;
-import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY;
-import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CLIENT_BIND_HOST_DEFAULT;
-import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CLIENT_BIND_HOST_KEY;
-import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CLIENT_PORT_DEFAULT;
-import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CLIENT_PORT_KEY;
-import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_DATANODE_ADDRESS_KEY;
-import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_DATANODE_PORT_DEFAULT;
-import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_DATANODE_PORT_KEY;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_BIND_HOST_DEFAULT;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_BIND_HOST_KEY;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_PORT_DEFAULT;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_PORT_KEY;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DATANODE_ADDRESS_KEY;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DATANODE_PORT_DEFAULT;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DATANODE_PORT_KEY;
/**
* This class runs the target server process.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/AsyncBlockWriter.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/AsyncBlockWriter.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/AsyncBlockWriter.java
index 992578f..0192c38 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/AsyncBlockWriter.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/AsyncBlockWriter.java
@@ -22,10 +22,10 @@ import com.google.common.primitives.Longs;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.hadoop.cblock.jscsiHelper.cache.LogicalBlock;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.scm.XceiverClientManager;
-import org.apache.hadoop.scm.XceiverClientSpi;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
-import org.apache.hadoop.scm.storage.ContainerProtocolCalls;
+import org.apache.hadoop.hdds.scm.XceiverClientManager;
+import org.apache.hadoop.hdds.scm.XceiverClientSpi;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.utils.LevelDBStore;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/CBlockLocalCache.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/CBlockLocalCache.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/CBlockLocalCache.java
index 1149164..ec5a4c9 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/CBlockLocalCache.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/CBlockLocalCache.java
@@ -24,8 +24,8 @@ import org.apache.hadoop.cblock.jscsiHelper.ContainerCacheFlusher;
import org.apache.hadoop.cblock.jscsiHelper.cache.CacheModule;
import org.apache.hadoop.cblock.jscsiHelper.cache.LogicalBlock;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.scm.XceiverClientManager;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.XceiverClientManager;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import org.apache.hadoop.cblock.jscsiHelper.CBlockTargetMetrics;
import org.apache.hadoop.utils.LevelDBStore;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/SyncBlockReader.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/SyncBlockReader.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/SyncBlockReader.java
index 7d6e172..557b201 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/SyncBlockReader.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/jscsiHelper/cache/impl/SyncBlockReader.java
@@ -22,10 +22,10 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.hadoop.cblock.jscsiHelper.cache.LogicalBlock;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdsl.protocol.proto.ContainerProtos;
-import org.apache.hadoop.scm.XceiverClientSpi;
-import org.apache.hadoop.scm.container.common.helpers.StorageContainerException;
-import org.apache.hadoop.scm.storage.ContainerProtocolCalls;
+import org.apache.hadoop.hdds.protocol.proto.ContainerProtos;
+import org.apache.hadoop.hdds.scm.XceiverClientSpi;
+import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
+import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.util.concurrent.HadoopThreadPoolExecutor;
import org.apache.hadoop.utils.LevelDBStore;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/kubernetes/DynamicProvisioner.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/kubernetes/DynamicProvisioner.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/kubernetes/DynamicProvisioner.java
index 72b215b..e21966b 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/kubernetes/DynamicProvisioner.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/kubernetes/DynamicProvisioner.java
@@ -38,7 +38,7 @@ import org.apache.hadoop.cblock.CblockUtils;
import org.apache.hadoop.cblock.exception.CBlockException;
import org.apache.hadoop.cblock.proto.MountVolumeResponse;
import org.apache.hadoop.cblock.storage.StorageManager;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.ratis.shaded.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/ContainerDescriptor.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/ContainerDescriptor.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/ContainerDescriptor.java
index 00064a6..2c31224 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/ContainerDescriptor.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/ContainerDescriptor.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.cblock.meta;
import com.google.protobuf.InvalidProtocolBufferException;
import org.apache.hadoop.cblock.protocol.proto.CBlockClientServerProtocolProtos;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
/**
*
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/VolumeDescriptor.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/VolumeDescriptor.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/VolumeDescriptor.java
index 4f5930d..930741d 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/VolumeDescriptor.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/meta/VolumeDescriptor.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.cblock.meta;
import com.google.protobuf.InvalidProtocolBufferException;
import org.apache.hadoop.cblock.protocol.proto.CBlockClientServerProtocolProtos;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/proto/MountVolumeResponse.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/proto/MountVolumeResponse.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/proto/MountVolumeResponse.java
index 70ccd90..d33337f 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/proto/MountVolumeResponse.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/proto/MountVolumeResponse.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.cblock.proto;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import java.util.HashMap;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/protocolPB/CBlockClientServerProtocolServerSideTranslatorPB.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/protocolPB/CBlockClientServerProtocolServerSideTranslatorPB.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/protocolPB/CBlockClientServerProtocolServerSideTranslatorPB.java
index bfe2130..f937a73 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/protocolPB/CBlockClientServerProtocolServerSideTranslatorPB.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/protocolPB/CBlockClientServerProtocolServerSideTranslatorPB.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.cblock.proto.MountVolumeResponse;
import org.apache.hadoop.cblock.protocol.proto.CBlockClientServerProtocolProtos;
import org.apache.hadoop.cblock.protocol.proto.CBlockServiceProtocolProtos;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import java.io.IOException;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/storage/StorageManager.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/storage/StorageManager.java b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/storage/StorageManager.java
index b9ec462..c6c6a78 100644
--- a/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/storage/StorageManager.java
+++ b/hadoop-cblock/server/src/main/java/org/apache/hadoop/cblock/storage/StorageManager.java
@@ -25,10 +25,10 @@ import org.apache.hadoop.cblock.meta.VolumeDescriptor;
import org.apache.hadoop.cblock.meta.VolumeInfo;
import org.apache.hadoop.cblock.proto.MountVolumeResponse;
import org.apache.hadoop.cblock.util.KeyUtil;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
-import org.apache.hadoop.hdsl.protocol.proto.HdslProtos;
-import org.apache.hadoop.scm.client.ScmClient;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.scm.client.ScmClient;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -187,8 +187,8 @@ public class StorageManager {
ContainerDescriptor container = null;
try {
Pipeline pipeline = storageClient.createContainer(
- HdslProtos.ReplicationType.STAND_ALONE,
- HdslProtos.ReplicationFactor.ONE,
+ HddsProtos.ReplicationType.STAND_ALONE,
+ HddsProtos.ReplicationFactor.ONE,
KeyUtil.getContainerName(volume.getUserName(),
volume.getVolumeName(), containerIdx), cblockId);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/main/proto/CBlockClientServerProtocol.proto
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/main/proto/CBlockClientServerProtocol.proto b/hadoop-cblock/server/src/main/proto/CBlockClientServerProtocol.proto
index 160b254..45d0de9 100644
--- a/hadoop-cblock/server/src/main/proto/CBlockClientServerProtocol.proto
+++ b/hadoop-cblock/server/src/main/proto/CBlockClientServerProtocol.proto
@@ -27,7 +27,7 @@ option java_generic_services = true;
option java_generate_equals_and_hash = true;
package hadoop.cblock;
-import "hdsl.proto";
+import "hdds.proto";
import "CBlockServiceProtocol.proto";
/**
* This message is sent from CBlock client side to CBlock server to
@@ -69,7 +69,7 @@ message ContainerIDProto {
required string containerID = 1;
required uint64 index = 2;
// making pipeline optional to be compatible with exisiting tests
- optional hadoop.hdsl.Pipeline pipeline = 3;
+ optional hadoop.hdds.Pipeline pipeline = 3;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java
index e1eb36f..50c4ba8 100644
--- a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java
+++ b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java
@@ -23,13 +23,13 @@ import org.apache.commons.lang.RandomStringUtils;
import org.apache.hadoop.cblock.jscsiHelper.CBlockTargetMetrics;
import org.apache.hadoop.cblock.jscsiHelper.ContainerCacheFlusher;
import org.apache.hadoop.cblock.jscsiHelper.cache.impl.CBlockLocalCache;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.io.IOUtils;
-import org.apache.hadoop.scm.XceiverClientManager;
-import org.apache.hadoop.scm.XceiverClientSpi;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
-import org.apache.hadoop.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB;
-import org.apache.hadoop.scm.storage.ContainerProtocolCalls;
+import org.apache.hadoop.hdds.scm.XceiverClientManager;
+import org.apache.hadoop.hdds.scm.XceiverClientSpi;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB;
+import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.MiniOzoneClassicCluster;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java
index d995ba6..fb58a4e 100644
--- a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java
+++ b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java
@@ -24,21 +24,21 @@ import org.apache.hadoop.cblock.jscsiHelper.CBlockTargetMetrics;
import org.apache.hadoop.cblock.jscsiHelper.ContainerCacheFlusher;
import org.apache.hadoop.cblock.jscsiHelper.cache.LogicalBlock;
import org.apache.hadoop.cblock.jscsiHelper.cache.impl.CBlockLocalCache;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.ozone.MiniOzoneClassicCluster;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.hdsl.protocol.proto.HdslProtos.LifeCycleState;
-import org.apache.hadoop.hdsl.protocol.proto.HdslProtos.ReplicationFactor;
-import org.apache.hadoop.hdsl.protocol.proto.HdslProtos.ReplicationType;
-import org.apache.hadoop.scm.XceiverClientManager;
-import org.apache.hadoop.scm.XceiverClientSpi;
-import org.apache.hadoop.scm.container.common.helpers.PipelineChannel;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
-import org.apache.hadoop.scm.protocolPB
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
+import org.apache.hadoop.hdds.scm.XceiverClientManager;
+import org.apache.hadoop.hdds.scm.XceiverClientSpi;
+import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineChannel;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.protocolPB
.StorageContainerLocationProtocolClientSideTranslatorPB;
-import org.apache.hadoop.scm.storage.ContainerProtocolCalls;
+import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
import org.apache.hadoop.test.GenericTestUtils;
import org.junit.AfterClass;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java
index 90fe802..386c9b2 100644
--- a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java
+++ b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.cblock;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.hadoop.cblock.meta.VolumeInfo;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
-import org.apache.hadoop.scm.client.ScmClient;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.scm.client.ScmClient;
import org.apache.hadoop.cblock.util.MockStorageClient;
import org.junit.After;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java
index 1ea183b..db13972 100644
--- a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java
+++ b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.cblock;
import org.apache.hadoop.cblock.meta.VolumeDescriptor;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
-import org.apache.hadoop.scm.client.ScmClient;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.scm.client.ScmClient;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.cblock.util.MockStorageClient;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java
index 6eb7ea6..e1e2909 100644
--- a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java
+++ b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java
@@ -25,16 +25,16 @@ import org.apache.hadoop.cblock.jscsiHelper.CBlockTargetMetrics;
import org.apache.hadoop.cblock.jscsiHelper.ContainerCacheFlusher;
import org.apache.hadoop.cblock.jscsiHelper.cache.LogicalBlock;
import org.apache.hadoop.cblock.jscsiHelper.cache.impl.CBlockLocalCache;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.ozone.MiniOzoneClassicCluster;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.scm.XceiverClientManager;
-import org.apache.hadoop.scm.XceiverClientSpi;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
-import org.apache.hadoop.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB;
-import org.apache.hadoop.scm.storage.ContainerProtocolCalls;
+import org.apache.hadoop.hdds.scm.XceiverClientManager;
+import org.apache.hadoop.hdds.scm.XceiverClientSpi;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB;
+import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.Time;
import org.junit.AfterClass;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/kubernetes/TestDynamicProvisioner.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/kubernetes/TestDynamicProvisioner.java b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/kubernetes/TestDynamicProvisioner.java
index 8d1a865..0268ccc 100644
--- a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/kubernetes/TestDynamicProvisioner.java
+++ b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/kubernetes/TestDynamicProvisioner.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import java.nio.file.Files;
import java.nio.file.Paths;
-import org.apache.hadoop.hdsl.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
/**
* Test the resource generation of Dynamic Provisioner.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b832f3c/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/util/ContainerLookUpService.java
----------------------------------------------------------------------
diff --git a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/util/ContainerLookUpService.java b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/util/ContainerLookUpService.java
index 8cb57d6..d7dabe3 100644
--- a/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/util/ContainerLookUpService.java
+++ b/hadoop-cblock/server/src/test/java/org/apache/hadoop/cblock/util/ContainerLookUpService.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.cblock.util;
import org.apache.hadoop.cblock.meta.ContainerDescriptor;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org