HADOOP-15791. Remove Ozone related sources from the 3.2 branch. Contributed by Elek, Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2c392da8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2c392da8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2c392da8 Branch: refs/heads/branch-3.2 Commit: 2c392da8aa790ea7541745c4d77e0b5ecbc47ac6 Parents: 83b9b25 Author: Sunil G <[email protected]> Authored: Fri Oct 5 16:10:47 2018 +0530 Committer: Sunil G <[email protected]> Committed: Fri Oct 5 16:10:47 2018 +0530 ---------------------------------------------------------------------- .gitignore | 10 - dev-support/bin/dist-layout-stitching | 3 - .../assemblies/hadoop-src-with-hdds.xml | 56 - .../main/resources/assemblies/hadoop-src.xml | 2 - .../src/main/bin/hadoop-functions.sh | 5 - .../hadoop-common/src/main/conf/hadoop-env.sh | 9 - hadoop-hdds/client/pom.xml | 44 - .../hadoop/hdds/scm/XceiverClientGrpc.java | 215 --- .../hadoop/hdds/scm/XceiverClientManager.java | 224 --- .../hadoop/hdds/scm/XceiverClientMetrics.java | 92 -- .../hadoop/hdds/scm/XceiverClientRatis.java | 215 --- .../scm/client/ContainerOperationClient.java | 476 ------ .../hadoop/hdds/scm/client/HddsClientUtils.java | 255 ---- .../hadoop/hdds/scm/client/package-info.java | 23 - .../apache/hadoop/hdds/scm/package-info.java | 23 - .../hdds/scm/storage/ChunkInputStream.java | 279 ---- .../hdds/scm/storage/ChunkOutputStream.java | 236 --- .../hadoop/hdds/scm/storage/package-info.java | 23 - .../common/dev-support/findbugsExcludeFile.xml | 28 - hadoop-hdds/common/pom.xml | 250 ---- .../common/src/main/conf/log4j.properties | 157 -- .../org/apache/hadoop/hdds/HddsConfigKeys.java | 97 -- .../org/apache/hadoop/hdds/HddsIdFactory.java | 53 - .../java/org/apache/hadoop/hdds/HddsUtils.java | 351 ----- .../org/apache/hadoop/hdds/cli/GenericCli.java | 100 -- .../hadoop/hdds/cli/GenericParentCommand.java | 25 - .../hadoop/hdds/cli/HddsVersionProvider.java | 35 - .../hdds/cli/MissingSubcommandException.java | 35 - .../apache/hadoop/hdds/cli/package-info.java | 22 - .../org/apache/hadoop/hdds/client/BlockID.java | 90 -- .../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/HddsConfServlet.java | 185 --- .../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 | 401 ----- .../hadoop/hdds/protocol/package-info.java | 22 - .../apache/hadoop/hdds/scm/ScmConfigKeys.java | 287 ---- .../org/apache/hadoop/hdds/scm/ScmInfo.java | 81 -- .../hadoop/hdds/scm/XceiverClientSpi.java | 135 -- .../hadoop/hdds/scm/client/ScmClient.java | 174 --- .../hadoop/hdds/scm/client/package-info.java | 24 - .../hadoop/hdds/scm/container/ContainerID.java | 107 -- .../common/helpers/AllocatedBlock.java | 79 - .../helpers/BlockNotCommittedException.java | 36 - .../container/common/helpers/ContainerInfo.java | 482 ------ .../common/helpers/ContainerWithPipeline.java | 132 -- .../common/helpers/DeleteBlockResult.java | 53 - .../scm/container/common/helpers/Pipeline.java | 315 ---- .../container/common/helpers/PipelineID.java | 97 -- .../helpers/StorageContainerException.java | 104 -- .../container/common/helpers/package-info.java | 22 - .../hadoop/hdds/scm/container/package-info.java | 18 - .../apache/hadoop/hdds/scm/package-info.java | 24 - .../hdds/scm/protocol/LocatedContainer.java | 127 -- .../scm/protocol/ScmBlockLocationProtocol.java | 60 - .../hdds/scm/protocol/ScmLocatedBlock.java | 100 -- .../StorageContainerLocationProtocol.java | 152 -- .../hadoop/hdds/scm/protocol/package-info.java | 19 - ...kLocationProtocolClientSideTranslatorPB.java | 173 --- .../protocolPB/ScmBlockLocationProtocolPB.java | 35 - ...rLocationProtocolClientSideTranslatorPB.java | 371 ----- .../StorageContainerLocationProtocolPB.java | 36 - .../hdds/scm/protocolPB/package-info.java | 24 - .../scm/storage/ContainerProtocolCalls.java | 432 ------ .../hadoop/hdds/scm/storage/package-info.java | 23 - .../java/org/apache/hadoop/ozone/OzoneAcl.java | 233 --- .../apache/hadoop/ozone/OzoneConfigKeys.java | 308 ---- .../org/apache/hadoop/ozone/OzoneConsts.java | 216 --- .../apache/hadoop/ozone/audit/AuditAction.java | 30 - .../hadoop/ozone/audit/AuditEventStatus.java | 36 - .../apache/hadoop/ozone/audit/AuditLogger.java | 76 - .../hadoop/ozone/audit/AuditLoggerType.java | 37 - .../apache/hadoop/ozone/audit/AuditMarker.java | 38 - .../apache/hadoop/ozone/audit/AuditMessage.java | 131 -- .../apache/hadoop/ozone/audit/Auditable.java | 32 - .../org/apache/hadoop/ozone/audit/Auditor.java | 33 - .../apache/hadoop/ozone/audit/package-info.java | 138 -- .../apache/hadoop/ozone/common/BlockGroup.java | 97 -- .../ozone/common/DeleteBlockGroupResult.java | 97 -- .../InconsistentStorageStateException.java | 51 - .../org/apache/hadoop/ozone/common/Storage.java | 249 ---- .../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/BlockData.java | 255 ---- .../container/common/helpers/ChunkInfo.java | 184 --- .../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 | 251 ---- .../lease/LeaseManagerNotRunningException.java | 45 - .../ozone/lease/LeaseNotFoundException.java | 46 - .../apache/hadoop/ozone/lease/package-info.java | 26 - .../apache/hadoop/ozone/lock/ActiveLock.java | 101 -- .../apache/hadoop/ozone/lock/LockManager.java | 101 -- .../hadoop/ozone/lock/PooledLockFactory.java | 43 - .../apache/hadoop/ozone/lock/package-info.java | 21 - .../org/apache/hadoop/ozone/package-info.java | 35 - ...kLocationProtocolServerSideTranslatorPB.java | 134 -- ...rLocationProtocolServerSideTranslatorPB.java | 253 ---- .../hadoop/ozone/protocolPB/package-info.java | 24 - .../hadoop/ozone/web/utils/JsonUtils.java | 71 - .../hadoop/ozone/web/utils/package-info.java | 19 - .../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 - .../apache/hadoop/utils/HddsVersionInfo.java | 184 --- .../org/apache/hadoop/utils/LevelDBStore.java | 387 ----- .../hadoop/utils/LevelDBStoreIterator.java | 64 - .../apache/hadoop/utils/MetaStoreIterator.java | 39 - .../apache/hadoop/utils/MetadataKeyFilters.java | 205 --- .../org/apache/hadoop/utils/MetadataStore.java | 227 --- .../hadoop/utils/MetadataStoreBuilder.java | 152 -- .../org/apache/hadoop/utils/RocksDBStore.java | 388 ----- .../hadoop/utils/RocksDBStoreIterator.java | 66 - .../apache/hadoop/utils/RocksDBStoreMBean.java | 144 -- .../hadoop/utils/db/DBConfigFromFile.java | 146 -- .../org/apache/hadoop/utils/db/DBProfile.java | 120 -- .../org/apache/hadoop/utils/db/DBStore.java | 115 -- .../apache/hadoop/utils/db/DBStoreBuilder.java | 201 --- .../org/apache/hadoop/utils/db/RDBStore.java | 270 ---- .../hadoop/utils/db/RDBStoreIterator.java | 88 -- .../org/apache/hadoop/utils/db/RDBTable.java | 173 --- .../java/org/apache/hadoop/utils/db/Table.java | 150 -- .../org/apache/hadoop/utils/db/TableConfig.java | 93 -- .../apache/hadoop/utils/db/TableIterator.java | 50 - .../apache/hadoop/utils/db/package-info.java | 22 - .../org/apache/hadoop/utils/package-info.java | 18 - .../main/java/org/apache/ratis/RatisHelper.java | 207 --- .../java/org/apache/ratis/package-info.java | 22 - .../main/proto/DatanodeContainerProtocol.proto | 451 ------ .../main/proto/ScmBlockLocationProtocol.proto | 136 -- .../StorageContainerLocationProtocol.proto | 239 --- hadoop-hdds/common/src/main/proto/hdds.proto | 194 --- .../main/resources/hdds-version-info.properties | 26 - .../common/src/main/resources/ozone-default.xml | 1299 ----------------- .../apache/hadoop/hdds/scm/package-info.java | 21 - .../org/apache/hadoop/ozone/TestOzoneAcls.java | 141 -- .../apache/hadoop/ozone/audit/DummyAction.java | 51 - .../apache/hadoop/ozone/audit/DummyEntity.java | 57 - .../ozone/audit/TestOzoneAuditLogger.java | 166 --- .../apache/hadoop/ozone/audit/package-info.java | 23 - .../hadoop/ozone/common/TestStateMachine.java | 106 -- .../hadoop/ozone/lease/TestLeaseManager.java | 373 ----- .../apache/hadoop/ozone/lease/package-info.java | 21 - .../hadoop/ozone/lock/TestLockManager.java | 64 - .../apache/hadoop/ozone/lock/package-info.java | 21 - .../org/apache/hadoop/ozone/package-info.java | 21 - .../apache/hadoop/utils/TestHddsIdFactory.java | 77 - .../apache/hadoop/utils/TestMetadataStore.java | 590 -------- .../hadoop/utils/TestRocksDBStoreMBean.java | 87 -- .../hadoop/utils/db/TestDBConfigFromFile.java | 116 -- .../hadoop/utils/db/TestDBStoreBuilder.java | 174 --- .../apache/hadoop/utils/db/TestRDBStore.java | 255 ---- .../hadoop/utils/db/TestRDBTableStore.java | 198 --- .../apache/hadoop/utils/db/package-info.java | 22 - .../common/src/test/resources/log4j2.properties | 76 - .../common/src/test/resources/test.db.ini | 145 -- .../dev-support/findbugsExcludeFile.xml | 21 - hadoop-hdds/container-service/pom.xml | 109 -- .../apache/hadoop/hdds/scm/HddsServerUtil.java | 336 ----- .../org/apache/hadoop/hdds/scm/VersionInfo.java | 81 -- .../apache/hadoop/hdds/scm/package-info.java | 19 - .../hadoop/ozone/HddsDatanodeService.java | 256 ---- .../container/common/DataNodeLayoutVersion.java | 80 - .../common/helpers/ContainerMetrics.java | 121 -- .../common/helpers/ContainerReport.java | 205 --- .../common/helpers/ContainerUtils.java | 305 ---- .../common/helpers/DatanodeVersionFile.java | 95 -- .../helpers/DeletedContainerBlocksSummary.java | 104 -- .../common/helpers/KeyValueContainerReport.java | 117 -- .../container/common/helpers/package-info.java | 22 - .../common/impl/ChunkLayOutVersion.java | 98 -- .../container/common/impl/ContainerData.java | 435 ------ .../common/impl/ContainerDataYaml.java | 326 ----- .../container/common/impl/ContainerSet.java | 220 --- .../container/common/impl/HddsDispatcher.java | 213 --- .../common/impl/OpenContainerBlockMap.java | 151 -- .../RandomContainerDeletionChoosingPolicy.java | 70 - .../common/impl/StorageLocationReport.java | 300 ---- ...NOrderedContainerDeletionChoosingPolicy.java | 90 -- .../container/common/impl/package-info.java | 22 - .../common/interfaces/BlockIterator.java | 57 - .../container/common/interfaces/Container.java | 135 -- .../ContainerDeletionChoosingPolicy.java | 58 - .../common/interfaces/ContainerDispatcher.java | 65 - .../interfaces/ContainerLocationManager.java | 58 - .../ContainerLocationManagerMXBean.java | 34 - .../common/interfaces/ContainerPacker.java | 58 - .../container/common/interfaces/Handler.java | 87 -- .../interfaces/StorageLocationReportMXBean.java | 40 - .../common/interfaces/VolumeChoosingPolicy.java | 46 - .../common/interfaces/package-info.java | 20 - .../ozone/container/common/package-info.java | 28 - .../report/CommandStatusReportPublisher.java | 87 -- .../common/report/ContainerReportPublisher.java | 85 -- .../common/report/NodeReportPublisher.java | 66 - .../common/report/PipelineReportPublisher.java | 73 - .../container/common/report/ReportManager.java | 148 -- .../common/report/ReportPublisher.java | 115 -- .../common/report/ReportPublisherFactory.java | 79 - .../container/common/report/package-info.java | 80 - .../statemachine/DatanodeStateMachine.java | 434 ------ .../statemachine/EndpointStateMachine.java | 295 ---- .../statemachine/EndpointStateMachineMBean.java | 34 - .../statemachine/SCMConnectionManager.java | 211 --- .../SCMConnectionManagerMXBean.java | 27 - .../common/statemachine/StateContext.java | 504 ------- .../CloseContainerCommandHandler.java | 159 -- .../commandhandler/CommandDispatcher.java | 182 --- .../commandhandler/CommandHandler.java | 75 - .../DeleteBlocksCommandHandler.java | 266 ---- .../ReplicateContainerCommandHandler.java | 102 -- .../commandhandler/package-info.java | 18 - .../common/statemachine/package-info.java | 28 - .../container/common/states/DatanodeState.java | 55 - .../states/datanode/InitDatanodeState.java | 182 --- .../states/datanode/RunningDatanodeState.java | 178 --- .../common/states/datanode/package-info.java | 21 - .../states/endpoint/HeartbeatEndpointTask.java | 385 ----- .../states/endpoint/RegisterEndpointTask.java | 257 ---- .../states/endpoint/VersionEndpointTask.java | 112 -- .../common/states/endpoint/package-info.java | 20 - .../container/common/states/package-info.java | 18 - .../transport/server/GrpcXceiverService.java | 80 - .../transport/server/XceiverServerGrpc.java | 150 -- .../transport/server/XceiverServerSpi.java | 61 - .../common/transport/server/package-info.java | 24 - .../transport/server/ratis/CSMMetrics.java | 115 -- .../server/ratis/ContainerStateMachine.java | 656 --------- .../server/ratis/XceiverServerRatis.java | 429 ------ .../transport/server/ratis/package-info.java | 23 - .../container/common/utils/ContainerCache.java | 172 --- .../container/common/utils/HddsVolumeUtil.java | 219 --- .../container/common/utils/package-info.java | 18 - .../container/common/volume/HddsVolume.java | 408 ------ .../volume/RoundRobinVolumeChoosingPolicy.java | 83 -- .../container/common/volume/VolumeIOStats.java | 139 -- .../container/common/volume/VolumeInfo.java | 140 -- .../container/common/volume/VolumeSet.java | 406 ------ .../container/common/volume/VolumeUsage.java | 181 --- .../container/common/volume/package-info.java | 21 - .../keyvalue/KeyValueBlockIterator.java | 148 -- .../container/keyvalue/KeyValueContainer.java | 576 -------- .../keyvalue/KeyValueContainerData.java | 297 ---- .../container/keyvalue/KeyValueHandler.java | 850 ----------- .../container/keyvalue/TarContainerPacker.java | 249 ---- .../container/keyvalue/helpers/BlockUtils.java | 199 --- .../container/keyvalue/helpers/ChunkUtils.java | 357 ----- .../helpers/KeyValueContainerLocationUtil.java | 109 -- .../keyvalue/helpers/KeyValueContainerUtil.java | 226 --- .../keyvalue/helpers/SmallFileUtils.java | 84 -- .../keyvalue/helpers/package-info.java | 21 - .../keyvalue/impl/BlockManagerImpl.java | 229 --- .../keyvalue/impl/ChunkManagerImpl.java | 254 ---- .../container/keyvalue/impl/package-info.java | 21 - .../keyvalue/interfaces/BlockManager.java | 84 -- .../keyvalue/interfaces/ChunkManager.java | 80 - .../keyvalue/interfaces/package-info.java | 21 - .../ozone/container/keyvalue/package-info.java | 21 - .../background/BlockDeletingService.java | 258 ---- .../statemachine/background/package-info.java | 18 - .../container/ozoneimpl/ContainerReader.java | 208 --- .../container/ozoneimpl/OzoneContainer.java | 236 --- .../ozone/container/ozoneimpl/package-info.java | 21 - .../replication/ContainerDownloader.java | 40 - .../replication/ContainerReplicationSource.java | 49 - .../replication/ContainerReplicator.java | 27 - .../replication/ContainerStreamingOutput.java | 45 - .../DownloadAndImportReplicator.java | 136 -- .../replication/GrpcReplicationClient.java | 169 --- .../replication/GrpcReplicationService.java | 130 -- .../OnDemandContainerReplicationSource.java | 76 - .../replication/ReplicationSupervisor.java | 142 -- .../container/replication/ReplicationTask.java | 102 -- .../replication/SimpleContainerDownloader.java | 121 -- .../container/replication/package-info.java | 21 - .../org/apache/hadoop/ozone/package-info.java | 23 - .../StorageContainerDatanodeProtocol.java | 75 - .../protocol/StorageContainerNodeProtocol.java | 70 - .../hadoop/ozone/protocol/VersionResponse.java | 154 -- .../commands/CloseContainerCommand.java | 84 -- .../protocol/commands/CommandForDatanode.java | 51 - .../ozone/protocol/commands/CommandStatus.java | 164 --- .../commands/DeleteBlockCommandStatus.java | 92 -- .../protocol/commands/DeleteBlocksCommand.java | 75 - .../protocol/commands/RegisteredCommand.java | 215 --- .../commands/ReplicateContainerCommand.java | 102 -- .../protocol/commands/ReregisterCommand.java | 67 - .../ozone/protocol/commands/SCMCommand.java | 62 - .../ozone/protocol/commands/package-info.java | 21 - .../hadoop/ozone/protocol/package-info.java | 23 - ...rDatanodeProtocolClientSideTranslatorPB.java | 167 --- .../StorageContainerDatanodeProtocolPB.java | 34 - ...rDatanodeProtocolServerSideTranslatorPB.java | 94 -- .../hadoop/ozone/protocolPB/package-info.java | 19 - .../StorageContainerDatanodeProtocol.proto | 386 ----- ...m.sun.jersey.spi.container.ContainerProvider | 16 - .../container/common/ContainerTestUtils.java | 68 - .../ozone/container/common/SCMTestUtils.java | 129 -- .../ozone/container/common/ScmTestMock.java | 353 ----- .../common/TestChunkLayOutVersion.java | 42 - .../common/TestDatanodeLayOutVersion.java | 38 - .../common/TestDatanodeStateMachine.java | 424 ------ .../common/TestKeyValueContainerData.java | 88 -- .../common/helpers/TestDatanodeVersionFile.java | 134 -- .../common/impl/TestContainerDataYaml.java | 219 --- .../container/common/impl/TestContainerSet.java | 182 --- .../common/impl/TestHddsDispatcher.java | 153 -- .../container/common/impl/package-info.java | 22 - .../common/interfaces/TestHandler.java | 80 - .../ozone/container/common/package-info.java | 22 - .../common/report/TestReportManager.java | 52 - .../common/report/TestReportPublisher.java | 200 --- .../report/TestReportPublisherFactory.java | 68 - .../container/common/report/package-info.java | 22 - .../commandhandler/package-info.java | 22 - .../endpoint/TestHeartbeatEndpointTask.java | 295 ---- .../common/states/endpoint/package-info.java | 18 - .../container/common/volume/TestHddsVolume.java | 145 -- .../TestRoundRobinVolumeChoosingPolicy.java | 126 -- .../container/common/volume/TestVolumeSet.java | 254 ---- .../keyvalue/TestBlockManagerImpl.java | 211 --- .../keyvalue/TestChunkManagerImpl.java | 292 ---- .../keyvalue/TestKeyValueBlockIterator.java | 277 ---- .../keyvalue/TestKeyValueContainer.java | 374 ----- .../container/keyvalue/TestKeyValueHandler.java | 292 ---- .../keyvalue/TestTarContainerPacker.java | 231 --- .../container/ozoneimpl/TestOzoneContainer.java | 120 -- .../replication/TestReplicationSupervisor.java | 143 -- .../container/replication/package-info.java | 22 - .../testutils/BlockDeletingServiceTestImpl.java | 104 -- .../ozone/container/testutils/package-info.java | 18 - .../test/resources/additionalfields.container | 12 - .../test/resources/incorrect.checksum.container | 11 - .../src/test/resources/incorrect.container | 11 - .../src/test/resources/log4j.properties | 23 - hadoop-hdds/framework/README.md | 24 - hadoop-hdds/framework/pom.xml | 69 - .../hadoop/hdds/server/BaseHttpServer.java | 222 --- .../apache/hadoop/hdds/server/ServerUtils.java | 144 -- .../hadoop/hdds/server/ServiceRuntimeInfo.java | 64 - .../hdds/server/ServiceRuntimeInfoImpl.java | 55 - .../apache/hadoop/hdds/server/events/Event.java | 42 - .../hdds/server/events/EventExecutor.java | 68 - .../hadoop/hdds/server/events/EventHandler.java | 33 - .../hdds/server/events/EventPublisher.java | 28 - .../hadoop/hdds/server/events/EventQueue.java | 251 ---- .../hadoop/hdds/server/events/EventWatcher.java | 209 --- .../hdds/server/events/EventWatcherMetrics.java | 79 - .../server/events/IdentifiableEventPayload.java | 28 - .../server/events/SingleThreadExecutor.java | 118 -- .../hadoop/hdds/server/events/TypedEvent.java | 58 - .../hadoop/hdds/server/events/package-info.java | 23 - .../apache/hadoop/hdds/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 | 387 ----- .../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/hdds/server/TestBaseHttpServer.java | 98 -- .../hdds/server/events/EventHandlerStub.java | 38 - .../hdds/server/events/TestEventQueue.java | 83 -- .../hdds/server/events/TestEventQueueChain.java | 79 - .../hdds/server/events/TestEventWatcher.java | 292 ---- .../framework/src/test/resources/ozone-site.xml | 24 - hadoop-hdds/pom.xml | 203 --- hadoop-hdds/server-scm/pom.xml | 129 -- .../org/apache/hadoop/hdds/scm/ScmUtils.java | 45 - .../hadoop/hdds/scm/block/BlockManager.java | 78 - .../hadoop/hdds/scm/block/BlockManagerImpl.java | 485 ------- .../hdds/scm/block/BlockmanagerMXBean.java | 30 - .../block/DatanodeDeletedBlockTransactions.java | 148 -- .../hadoop/hdds/scm/block/DeletedBlockLog.java | 118 -- .../hdds/scm/block/DeletedBlockLogImpl.java | 428 ------ .../hdds/scm/block/PendingDeleteHandler.java | 38 - .../hdds/scm/block/PendingDeleteStatusList.java | 79 - .../hdds/scm/block/SCMBlockDeletingService.java | 196 --- .../hadoop/hdds/scm/block/package-info.java | 22 - .../scm/command/CommandStatusReportHandler.java | 131 -- .../hadoop/hdds/scm/command/package-info.java | 26 - .../container/CloseContainerEventHandler.java | 160 -- .../scm/container/CloseContainerWatcher.java | 100 -- .../scm/container/ContainerActionsHandler.java | 60 - .../hdds/scm/container/ContainerMapping.java | 699 --------- .../scm/container/ContainerReportHandler.java | 150 -- .../scm/container/ContainerStateManager.java | 570 -------- .../hadoop/hdds/scm/container/Mapping.java | 141 -- .../hdds/scm/container/closer/package-info.java | 23 - .../hadoop/hdds/scm/container/package-info.java | 22 - .../algorithms/ContainerPlacementPolicy.java | 44 - .../placement/algorithms/SCMCommonPolicy.java | 201 --- .../SCMContainerPlacementCapacity.java | 137 -- .../algorithms/SCMContainerPlacementRandom.java | 92 -- .../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 | 224 --- .../placement/metrics/SCMNodeStat.java | 139 -- .../placement/metrics/package-info.java | 20 - .../scm/container/placement/package-info.java | 19 - .../replication/ReplicationActivityStatus.java | 117 -- .../ReplicationActivityStatusMXBean.java | 28 - .../replication/ReplicationCommandWatcher.java | 56 - .../replication/ReplicationManager.java | 250 ---- .../container/replication/ReplicationQueue.java | 73 - .../replication/ReplicationRequest.java | 123 -- .../scm/container/replication/package-info.java | 23 - .../container/states/ContainerAttribute.java | 245 ---- .../scm/container/states/ContainerQueryKey.java | 110 -- .../scm/container/states/ContainerState.java | 96 -- .../scm/container/states/ContainerStateMap.java | 569 -------- .../hdds/scm/container/states/package-info.java | 22 - .../hadoop/hdds/scm/events/SCMEvents.java | 255 ---- .../hadoop/hdds/scm/events/package-info.java | 23 - .../hdds/scm/exceptions/SCMException.java | 124 -- .../hdds/scm/exceptions/package-info.java | 18 - .../hadoop/hdds/scm/node/CommandQueue.java | 190 --- .../hadoop/hdds/scm/node/DatanodeInfo.java | 128 -- .../hadoop/hdds/scm/node/DeadNodeHandler.java | 100 -- .../hadoop/hdds/scm/node/NewNodeHandler.java | 49 - .../hadoop/hdds/scm/node/NodeManager.java | 219 --- .../hadoop/hdds/scm/node/NodeManagerMXBean.java | 57 - .../hadoop/hdds/scm/node/NodeReportHandler.java | 55 - .../hadoop/hdds/scm/node/NodeStateManager.java | 725 ---------- .../hadoop/hdds/scm/node/SCMNodeManager.java | 599 -------- .../hdds/scm/node/SCMNodeStorageStatMXBean.java | 77 - .../hdds/scm/node/SCMNodeStorageStatMap.java | 368 ----- .../hadoop/hdds/scm/node/StaleNodeHandler.java | 42 - .../hdds/scm/node/StorageReportResult.java | 87 -- .../hadoop/hdds/scm/node/package-info.java | 31 - .../hdds/scm/node/states/Node2ContainerMap.java | 90 -- .../hdds/scm/node/states/Node2ObjectsMap.java | 162 --- .../hdds/scm/node/states/Node2PipelineMap.java | 75 - .../node/states/NodeAlreadyExistsException.java | 45 - .../hdds/scm/node/states/NodeException.java | 44 - .../scm/node/states/NodeNotFoundException.java | 47 - .../hdds/scm/node/states/NodeStateMap.java | 337 ----- .../hdds/scm/node/states/ReportResult.java | 110 -- .../hdds/scm/node/states/package-info.java | 22 - .../apache/hadoop/hdds/scm/package-info.java | 22 - .../pipelines/PipelineActionEventHandler.java | 62 - .../scm/pipelines/PipelineCloseHandler.java | 52 - .../hdds/scm/pipelines/PipelineManager.java | 171 --- .../scm/pipelines/PipelineReportHandler.java | 59 - .../hdds/scm/pipelines/PipelineSelector.java | 481 ------ .../scm/pipelines/PipelineStateManager.java | 136 -- .../hadoop/hdds/scm/pipelines/package-info.java | 38 - .../scm/pipelines/ratis/RatisManagerImpl.java | 129 -- .../hdds/scm/pipelines/ratis/package-info.java | 18 - .../standalone/StandaloneManagerImpl.java | 122 -- .../scm/pipelines/standalone/package-info.java | 18 - .../hadoop/hdds/scm/ratis/package-info.java | 22 - .../hdds/scm/server/ChillModePrecheck.java | 56 - .../apache/hadoop/hdds/scm/server/Precheck.java | 29 - .../hdds/scm/server/SCMBlockProtocolServer.java | 206 --- .../hdds/scm/server/SCMChillModeManager.java | 247 ---- .../scm/server/SCMClientProtocolServer.java | 380 ----- .../server/SCMDatanodeHeartbeatDispatcher.java | 231 --- .../scm/server/SCMDatanodeProtocolServer.java | 315 ---- .../hadoop/hdds/scm/server/SCMMXBean.java | 50 - .../hadoop/hdds/scm/server/SCMStorage.java | 73 - .../scm/server/StorageContainerManager.java | 942 ------------ .../StorageContainerManagerHttpServer.java | 77 - .../hadoop/hdds/scm/server/package-info.java | 22 - .../commands/RetriableDatanodeEventWatcher.java | 58 - .../ozone/protocol/commands/package-info.java | 18 - .../src/main/resources/webapps/scm/index.html | 76 - .../src/main/resources/webapps/scm/main.html | 20 - .../resources/webapps/scm/scm-overview.html | 60 - .../src/main/resources/webapps/scm/scm.js | 54 - .../hadoop/hdds/scm/HddsServerUtilTest.java | 308 ---- .../apache/hadoop/hdds/scm/HddsTestUtils.java | 85 -- .../TestStorageContainerManagerHttpServer.java | 142 -- .../org/apache/hadoop/hdds/scm/TestUtils.java | 433 ------ .../hadoop/hdds/scm/block/TestBlockManager.java | 175 --- .../hdds/scm/block/TestDeletedBlockLog.java | 403 ------ .../hadoop/hdds/scm/block/package-info.java | 23 - .../command/TestCommandStatusReportHandler.java | 135 -- .../hadoop/hdds/scm/command/package-info.java | 22 - .../hdds/scm/container/MockNodeManager.java | 592 -------- .../TestCloseContainerEventHandler.java | 177 --- .../container/TestContainerActionsHandler.java | 68 - .../scm/container/TestContainerMapping.java | 380 ----- .../container/TestContainerReportHandler.java | 239 --- .../container/TestContainerStateManager.java | 98 -- .../hdds/scm/container/closer/package-info.java | 22 - .../hadoop/hdds/scm/container/package-info.java | 22 - .../TestSCMContainerPlacementCapacity.java | 106 -- .../TestSCMContainerPlacementRandom.java | 86 -- .../TestReplicationActivityStatus.java | 63 - .../replication/TestReplicationManager.java | 238 --- .../replication/TestReplicationQueue.java | 134 -- .../scm/container/replication/package-info.java | 23 - .../states/TestContainerAttribute.java | 143 -- .../hdds/scm/container/states/package-info.java | 22 - .../hdds/scm/node/TestContainerPlacement.java | 171 --- .../hdds/scm/node/TestDeadNodeHandler.java | 236 --- .../hadoop/hdds/scm/node/TestNodeManager.java | 1144 --------------- .../hdds/scm/node/TestNodeReportHandler.java | 94 -- .../scm/node/TestSCMNodeStorageStatMap.java | 262 ---- .../hadoop/hdds/scm/node/package-info.java | 22 - .../scm/node/states/TestNode2ContainerMap.java | 327 ----- .../hdds/scm/node/states/package-info.java | 23 - .../apache/hadoop/hdds/scm/package-info.java | 21 - .../scm/server/TestSCMChillModeManager.java | 125 -- .../scm/server/TestSCMClientProtocolServer.java | 60 - .../TestSCMDatanodeHeartbeatDispatcher.java | 138 -- .../container/TestCloseContainerWatcher.java | 287 ---- .../ozone/container/common/TestEndPoint.java | 530 ------- .../ozone/container/common/package-info.java | 22 - .../placement/TestContainerPlacement.java | 137 -- .../placement/TestDatanodeMetrics.java | 59 - .../ozone/container/placement/package-info.java | 22 - .../container/replication/package-info.java | 18 - .../testutils/ReplicationNodeManagerMock.java | 402 ----- .../ozone/container/testutils/package-info.java | 18 - hadoop-hdds/tools/pom.xml | 57 - .../org/apache/hadoop/hdds/scm/cli/SCMCLI.java | 150 -- .../hdds/scm/cli/container/CloseSubcommand.java | 54 - .../scm/cli/container/CreateSubcommand.java | 65 - .../scm/cli/container/DeleteSubcommand.java | 60 - .../hdds/scm/cli/container/InfoSubcommand.java | 94 -- .../hdds/scm/cli/container/ListSubcommand.java | 83 -- .../hdds/scm/cli/container/package-info.java | 22 - .../hadoop/hdds/scm/cli/package-info.java | 23 - .../src/main/webapps/datanode/datanode.html | 48 +- .../src/test/resources/log4j.properties | 23 - hadoop-ozone/client/pom.xml | 37 - .../apache/hadoop/ozone/client/BucketArgs.java | 123 -- .../apache/hadoop/ozone/client/ObjectStore.java | 216 --- .../apache/hadoop/ozone/client/OzoneBucket.java | 382 ----- .../apache/hadoop/ozone/client/OzoneClient.java | 110 -- .../ozone/client/OzoneClientException.java | 54 - .../hadoop/ozone/client/OzoneClientFactory.java | 306 ---- .../client/OzoneClientInvocationHandler.java | 62 - .../hadoop/ozone/client/OzoneClientUtils.java | 136 -- .../apache/hadoop/ozone/client/OzoneKey.java | 119 -- .../hadoop/ozone/client/OzoneKeyDetails.java | 58 - .../hadoop/ozone/client/OzoneKeyLocation.java | 82 -- .../apache/hadoop/ozone/client/OzoneVolume.java | 311 ---- .../apache/hadoop/ozone/client/VolumeArgs.java | 128 -- .../ozone/client/io/ChunkGroupInputStream.java | 318 ---- .../ozone/client/io/ChunkGroupOutputStream.java | 733 ---------- .../ozone/client/io/OzoneInputStream.java | 65 - .../ozone/client/io/OzoneOutputStream.java | 64 - .../hadoop/ozone/client/io/package-info.java | 23 - .../hadoop/ozone/client/package-info.java | 23 - .../ozone/client/protocol/ClientProtocol.java | 329 ----- .../ozone/client/protocol/package-info.java | 23 - .../client/rest/DefaultRestServerSelector.java | 36 - .../ozone/client/rest/OzoneExceptionMapper.java | 45 - .../hadoop/ozone/client/rest/RestClient.java | 912 ------------ .../ozone/client/rest/RestServerSelector.java | 40 - .../client/rest/exceptions/package-info.java | 22 - .../ozone/client/rest/headers/package-info.java | 22 - .../hadoop/ozone/client/rest/package-info.java | 23 - .../hadoop/ozone/client/rpc/RpcClient.java | 576 -------- .../hadoop/ozone/client/rpc/package-info.java | 23 - .../ozone/client/TestHddsClientUtils.java | 105 -- .../hadoop/ozone/client/package-info.java | 23 - .../common/dev-support/findbugsExcludeFile.xml | 22 - hadoop-ozone/common/pom.xml | 115 -- hadoop-ozone/common/src/main/bin/ozone | 242 ---- .../common/src/main/bin/ozone-config.sh | 51 - hadoop-ozone/common/src/main/bin/start-ozone.sh | 127 -- hadoop-ozone/common/src/main/bin/stop-ozone.sh | 101 -- .../src/main/conf/om-audit-log4j2.properties | 86 -- .../common/src/main/conf/ozone-site.xml | 24 - .../java/org/apache/hadoop/ozone/OmUtils.java | 94 -- .../org/apache/hadoop/ozone/audit/OMAction.java | 61 - .../apache/hadoop/ozone/audit/package-info.java | 22 - .../ozone/client/io/LengthInputStream.java | 49 - .../hadoop/ozone/client/io/package-info.java | 22 - .../ozone/client/rest/OzoneException.java | 267 ---- .../ozone/client/rest/headers/Header.java | 74 - .../ozone/client/rest/headers/package-info.java | 22 - .../hadoop/ozone/client/rest/package-info.java | 22 - .../ozone/client/rest/response/BucketInfo.java | 231 --- .../ozone/client/rest/response/KeyInfo.java | 216 --- .../client/rest/response/KeyInfoDetails.java | 107 -- .../ozone/client/rest/response/KeyLocation.java | 89 -- .../ozone/client/rest/response/VolumeInfo.java | 215 --- .../ozone/client/rest/response/VolumeOwner.java | 61 - .../client/rest/response/package-info.java | 24 - .../apache/hadoop/ozone/freon/OzoneGetConf.java | 269 ---- .../apache/hadoop/ozone/freon/package-info.java | 21 - .../apache/hadoop/ozone/om/OMConfigKeys.java | 81 -- .../hadoop/ozone/om/helpers/OmBucketArgs.java | 256 ---- .../hadoop/ozone/om/helpers/OmBucketInfo.java | 254 ---- .../hadoop/ozone/om/helpers/OmKeyArgs.java | 167 --- .../hadoop/ozone/om/helpers/OmKeyInfo.java | 303 ---- .../ozone/om/helpers/OmKeyLocationInfo.java | 143 -- .../om/helpers/OmKeyLocationInfoGroup.java | 118 -- .../hadoop/ozone/om/helpers/OmOzoneAclMap.java | 110 -- .../hadoop/ozone/om/helpers/OmVolumeArgs.java | 237 --- .../hadoop/ozone/om/helpers/OpenKeySession.java | 50 - .../hadoop/ozone/om/helpers/ServiceInfo.java | 237 --- .../hadoop/ozone/om/helpers/VolumeArgs.java | 140 -- .../hadoop/ozone/om/helpers/package-info.java | 18 - .../apache/hadoop/ozone/om/package-info.java | 21 - .../ozone/om/protocol/OzoneManagerProtocol.java | 253 ---- .../hadoop/ozone/om/protocol/package-info.java | 19 - ...neManagerProtocolClientSideTranslatorPB.java | 775 ---------- .../om/protocolPB/OzoneManagerProtocolPB.java | 34 - .../ozone/om/protocolPB/package-info.java | 19 - .../org/apache/hadoop/ozone/package-info.java | 22 - .../hadoop/ozone/protocolPB/OMPBHelper.java | 113 -- .../hadoop/ozone/protocolPB/OzonePBHelper.java | 30 - .../hadoop/ozone/protocolPB/package-info.java | 24 - .../hadoop/ozone/util/OzoneVersionInfo.java | 213 --- .../hadoop/ozone/web/handlers/BucketArgs.java | 214 --- .../hadoop/ozone/web/handlers/KeyArgs.java | 117 -- .../hadoop/ozone/web/handlers/ListArgs.java | 142 -- .../hadoop/ozone/web/handlers/UserArgs.java | 172 --- .../hadoop/ozone/web/handlers/VolumeArgs.java | 142 -- .../hadoop/ozone/web/handlers/package-info.java | 22 - .../hadoop/ozone/web/request/OzoneQuota.java | 214 --- .../hadoop/ozone/web/request/package-info.java | 23 - .../hadoop/ozone/web/response/BucketInfo.java | 325 ----- .../hadoop/ozone/web/response/KeyInfo.java | 290 ---- .../ozone/web/response/KeyInfoDetails.java | 80 - .../hadoop/ozone/web/response/KeyLocation.java | 82 -- .../hadoop/ozone/web/response/ListBuckets.java | 154 -- .../hadoop/ozone/web/response/ListKeys.java | 209 --- .../hadoop/ozone/web/response/ListVolumes.java | 152 -- .../hadoop/ozone/web/response/VolumeInfo.java | 308 ---- .../hadoop/ozone/web/response/VolumeOwner.java | 60 - .../hadoop/ozone/web/response/package-info.java | 23 - .../hadoop/ozone/web/utils/OzoneUtils.java | 227 --- .../hadoop/ozone/web/utils/package-info.java | 18 - .../src/main/proto/OzoneManagerProtocol.proto | 481 ------ .../resources/ozone-version-info.properties | 27 - .../src/main/shellprofile.d/hadoop-ozone.sh | 21 - .../apache/hadoop/ozone/web/TestBucketInfo.java | 81 -- .../org/apache/hadoop/ozone/web/TestQuota.java | 116 -- .../org/apache/hadoop/ozone/web/TestUtils.java | 101 -- .../hadoop/ozone/web/TestVolumeStructs.java | 73 - .../apache/hadoop/ozone/web/package-info.java | 21 - hadoop-ozone/datanode/pom.xml | 49 - .../dist/dev-support/bin/dist-layout-stitching | 113 -- .../dist/dev-support/bin/dist-tar-stitching | 45 - hadoop-ozone/dist/pom.xml | 195 --- hadoop-ozone/dist/src/main/compose/README.md | 51 - .../dist/src/main/compose/ozone-hdfs/.env | 17 - .../main/compose/ozone-hdfs/docker-compose.yaml | 60 - .../src/main/compose/ozone-hdfs/docker-config | 76 - hadoop-ozone/dist/src/main/compose/ozone/.env | 17 - .../src/main/compose/ozone/docker-compose.yaml | 49 - .../dist/src/main/compose/ozone/docker-config | 75 - .../main/compose/ozonefs/docker-compose.yaml | 59 - .../dist/src/main/compose/ozonefs/docker-config | 35 - .../dist/src/main/compose/ozoneperf/.env | 17 - .../dist/src/main/compose/ozoneperf/README.md | 73 - .../src/main/compose/ozoneperf/compose-all.sh | 18 - .../compose/ozoneperf/docker-compose-freon.yaml | 26 - .../main/compose/ozoneperf/docker-compose.yaml | 64 - .../src/main/compose/ozoneperf/docker-config | 35 - .../dist/src/main/compose/ozoneperf/init.sh | 21 - .../src/main/compose/ozoneperf/prometheus.yml | 24 - .../main/compose/ozones3/docker-compose.yaml | 58 - .../dist/src/main/compose/ozones3/docker-config | 73 - .../compose/ozonescripts/.ssh/authorized_keys | 16 - .../src/main/compose/ozonescripts/.ssh/config | 18 - .../main/compose/ozonescripts/.ssh/environment | 16 - .../src/main/compose/ozonescripts/.ssh/id_rsa | 42 - .../main/compose/ozonescripts/.ssh/id_rsa.pub | 16 - .../src/main/compose/ozonescripts/Dockerfile | 33 - .../src/main/compose/ozonescripts/README.md | 38 - .../compose/ozonescripts/docker-compose.yaml | 42 - .../src/main/compose/ozonescripts/docker-config | 38 - .../dist/src/main/compose/ozonescripts/ps.sh | 17 - .../dist/src/main/compose/ozonescripts/start.sh | 24 - .../dist/src/main/compose/ozonescripts/stop.sh | 17 - hadoop-ozone/dist/src/main/ozone/README.txt | 51 - hadoop-ozone/dist/src/main/smoketest/README.md | 30 - .../dist/src/main/smoketest/basic/basic.robot | 47 - .../src/main/smoketest/basic/ozone-shell.robot | 82 -- .../dist/src/main/smoketest/commonlib.robot | 24 - .../src/main/smoketest/ozonefs/ozonefs.robot | 35 - .../dist/src/main/smoketest/s3/awscli.robot | 63 - hadoop-ozone/dist/src/main/smoketest/test.sh | 102 -- hadoop-ozone/docs/README.md | 55 - hadoop-ozone/docs/archetypes/default.md | 20 - hadoop-ozone/docs/config.yaml | 41 - hadoop-ozone/docs/content/BucketCommands.md | 122 -- hadoop-ozone/docs/content/BuildingSources.md | 54 - hadoop-ozone/docs/content/CommandShell.md | 109 -- hadoop-ozone/docs/content/Concepts.md | 108 -- hadoop-ozone/docs/content/Dozone.md | 110 -- hadoop-ozone/docs/content/Freon.md | 64 - hadoop-ozone/docs/content/Hdds.md | 65 - hadoop-ozone/docs/content/JavaApi.md | 172 --- hadoop-ozone/docs/content/KeyCommands.md | 127 -- hadoop-ozone/docs/content/OzoneFS.md | 80 - hadoop-ozone/docs/content/OzoneManager.md | 77 - hadoop-ozone/docs/content/RealCluster.md | 74 - hadoop-ozone/docs/content/Rest.md | 544 ------- hadoop-ozone/docs/content/RunningViaDocker.md | 73 - hadoop-ozone/docs/content/RunningWithHDFS.md | 77 - hadoop-ozone/docs/content/SCMCLI.md | 29 - hadoop-ozone/docs/content/Settings.md | 142 -- hadoop-ozone/docs/content/VolumeCommands.md | 116 -- hadoop-ozone/docs/content/_index.md | 39 - .../docs/dev-support/bin/generate-site.sh | 29 - hadoop-ozone/docs/pom.xml | 71 - hadoop-ozone/docs/static/NOTES.md | 20 - hadoop-ozone/docs/static/OzoneOverview.png | Bin 41729 -> 0 bytes hadoop-ozone/docs/static/OzoneOverview.svg | 238 --- hadoop-ozone/docs/static/SCMBlockDiagram.png | Bin 14714 -> 0 bytes hadoop-ozone/docs/static/ozone-logo.png | Bin 40237 -> 0 bytes .../ozonedoc/layouts/_default/single.html | 38 - .../docs/themes/ozonedoc/layouts/index.html | 37 - .../ozonedoc/layouts/partials/footer.html | 22 - .../ozonedoc/layouts/partials/header.html | 34 - .../ozonedoc/layouts/partials/navbar.html | 36 - .../ozonedoc/layouts/partials/sidebar.html | 52 - .../ozonedoc/static/css/bootstrap-theme.min.css | 6 - .../static/css/bootstrap-theme.min.css.map | 1 - .../ozonedoc/static/css/bootstrap.min.css | 6 - .../ozonedoc/static/css/bootstrap.min.css.map | 1 - .../themes/ozonedoc/static/css/ozonedoc.css | 138 -- .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 ---- .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../themes/ozonedoc/static/js/bootstrap.min.js | 7 - .../themes/ozonedoc/static/js/jquery.min.js | 5 - .../docs/themes/ozonedoc/static/js/ozonedoc.js | 23 - hadoop-ozone/docs/themes/ozonedoc/theme.toml | 2 - hadoop-ozone/integration-test/pom.xml | 81 -- .../TestContainerStateManagerIntegration.java | 417 ------ .../hdds/scm/pipeline/TestNode2PipelineMap.java | 131 -- .../hdds/scm/pipeline/TestNodeFailure.java | 126 -- .../hdds/scm/pipeline/TestPipelineClose.java | 147 -- .../hdds/scm/pipeline/TestSCMRestart.java | 119 -- .../apache/hadoop/ozone/MiniOzoneCluster.java | 362 ----- .../hadoop/ozone/MiniOzoneClusterImpl.java | 519 ------- .../org/apache/hadoop/ozone/OzoneTestUtils.java | 92 -- .../apache/hadoop/ozone/RatisTestHelper.java | 129 -- .../hadoop/ozone/TestContainerOperations.java | 88 -- .../hadoop/ozone/TestMiniOzoneCluster.java | 215 --- .../ozone/TestOzoneConfigurationFields.java | 42 - .../apache/hadoop/ozone/TestOzoneHelper.java | 413 ------ .../ozone/TestStorageContainerManager.java | 460 ------ .../TestStorageContainerManagerHelper.java | 184 --- .../ozone/client/rest/TestOzoneRestClient.java | 495 ------- .../hadoop/ozone/client/rest/package-info.java | 23 - .../rpc/TestCloseContainerHandlingByClient.java | 490 ------- .../ozone/client/rpc/TestOzoneRpcClient.java | 979 ------------- .../hadoop/ozone/client/rpc/package-info.java | 23 - .../ozone/container/ContainerTestHelper.java | 616 -------- .../container/TestContainerReplication.java | 179 --- .../common/TestBlockDeletingService.java | 440 ------ .../container/common/helpers/TestBlockData.java | 127 -- .../common/impl/TestCloseContainerHandler.java | 261 ---- .../TestContainerDeletionChoosingPolicy.java | 162 --- .../common/impl/TestContainerPersistence.java | 803 ---------- .../commandhandler/TestBlockDeletion.java | 329 ----- .../TestCloseContainerByPipeline.java | 265 ---- .../TestCloseContainerHandler.java | 114 -- .../transport/server/ratis/TestCSMMetrics.java | 189 --- .../container/metrics/TestContainerMetrics.java | 151 -- .../container/ozoneimpl/TestOzoneContainer.java | 574 -------- .../ozoneimpl/TestOzoneContainerRatis.java | 138 -- .../container/ozoneimpl/TestRatisManager.java | 124 -- .../container/server/TestContainerServer.java | 246 ---- .../server/TestContainerStateMachine.java | 201 --- .../apache/hadoop/ozone/freon/package-info.java | 21 - .../ozone/om/TestContainerReportWithKeys.java | 130 -- .../om/TestMultipleContainerReadWrite.java | 212 --- .../hadoop/ozone/om/TestOmBlockVersioning.java | 263 ---- .../apache/hadoop/ozone/om/TestOmMetrics.java | 310 ---- .../hadoop/ozone/om/TestOzoneManager.java | 1368 ------------------ .../ozone/om/TestOzoneManagerRestInterface.java | 135 -- .../hadoop/ozone/om/TestScmChillMode.java | 365 ----- .../apache/hadoop/ozone/om/package-info.java | 22 - .../hadoop/ozone/ozShell/TestOzoneShell.java | 1102 -------------- .../hadoop/ozone/scm/TestAllocateContainer.java | 83 -- .../ozone/scm/TestContainerSmallFile.java | 161 --- .../TestGetCommittedBlockLengthAndPutKey.java | 254 ---- .../apache/hadoop/ozone/scm/TestSCMMXBean.java | 161 --- .../ozone/scm/TestXceiverClientManager.java | 210 --- .../ozone/scm/TestXceiverClientMetrics.java | 173 --- .../hadoop/ozone/scm/node/TestQueryNode.java | 118 -- .../ozone/web/TestOzoneRestWithMiniCluster.java | 218 --- .../hadoop/ozone/web/TestOzoneVolumes.java | 183 --- .../hadoop/ozone/web/TestOzoneWebAccess.java | 118 -- .../hadoop/ozone/web/client/TestBuckets.java | 335 ----- .../ozone/web/client/TestBucketsRatis.java | 107 -- .../hadoop/ozone/web/client/TestKeys.java | 761 ---------- .../hadoop/ozone/web/client/TestKeysRatis.java | 126 -- .../ozone/web/client/TestOzoneClient.java | 304 ---- .../hadoop/ozone/web/client/TestVolume.java | 382 ----- .../ozone/web/client/TestVolumeRatis.java | 154 -- .../src/test/resources/log4j.properties | 21 - .../resources/webapps/ozoneManager/.gitkeep | 15 - .../src/test/resources/webapps/scm/.gitkeep | 15 - hadoop-ozone/objectstore-service/pom.xml | 114 -- .../server/datanode/ObjectStoreHandler.java | 164 --- .../hdfs/server/datanode/package-info.java | 22 - .../org/apache/hadoop/ozone/OzoneRestUtils.java | 222 --- .../org/apache/hadoop/ozone/package-info.java | 22 - .../ozone/web/ObjectStoreApplication.java | 59 - .../ozone/web/OzoneHddsDatanodeService.java | 87 -- .../hadoop/ozone/web/exceptions/ErrorTable.java | 225 --- .../ozone/web/exceptions/package-info.java | 22 - .../ozone/web/handlers/BucketHandler.java | 197 --- .../web/handlers/BucketProcessTemplate.java | 323 ----- .../hadoop/ozone/web/handlers/KeyHandler.java | 302 ---- .../ozone/web/handlers/KeyProcessTemplate.java | 235 --- .../ozone/web/handlers/ServiceFilter.java | 61 - .../web/handlers/StorageHandlerBuilder.java | 80 - .../ozone/web/handlers/UserHandlerBuilder.java | 75 - .../ozone/web/handlers/VolumeHandler.java | 272 ---- .../web/handlers/VolumeProcessTemplate.java | 276 ---- .../hadoop/ozone/web/handlers/package-info.java | 22 - .../hadoop/ozone/web/interfaces/Accounting.java | 57 - .../hadoop/ozone/web/interfaces/Bucket.java | 183 --- .../hadoop/ozone/web/interfaces/Keys.java | 177 --- .../ozone/web/interfaces/StorageHandler.java | 316 ---- .../hadoop/ozone/web/interfaces/UserAuth.java | 101 -- .../hadoop/ozone/web/interfaces/Volume.java | 182 --- .../ozone/web/interfaces/package-info.java | 22 - .../ozone/web/localstorage/package-info.java | 18 - .../LengthInputStreamMessageBodyWriter.java | 59 - .../web/messages/StringMessageBodyWriter.java | 62 - .../hadoop/ozone/web/messages/package-info.java | 18 - .../web/netty/CloseableCleanupListener.java | 46 - .../web/netty/ObjectStoreChannelHandler.java | 78 - .../web/netty/ObjectStoreJerseyContainer.java | 348 ----- .../ObjectStoreJerseyContainerProvider.java | 40 - .../web/netty/ObjectStoreRestHttpServer.java | 215 --- .../web/netty/ObjectStoreURLDispatcher.java | 61 - ...RequestContentObjectStoreChannelHandler.java | 117 -- ...equestDispatchObjectStoreChannelHandler.java | 103 -- .../hadoop/ozone/web/netty/package-info.java | 26 - .../apache/hadoop/ozone/web/package-info.java | 22 - .../web/storage/DistributedStorageHandler.java | 576 -------- .../hadoop/ozone/web/storage/package-info.java | 27 - .../hadoop/ozone/web/userauth/Simple.java | 169 --- .../hadoop/ozone/web/userauth/package-info.java | 23 - ...m.sun.jersey.spi.container.ContainerProvider | 16 - .../apache/hadoop/ozone/web/TestErrorCode.java | 53 - hadoop-ozone/ozone-manager/pom.xml | 86 -- .../apache/hadoop/ozone/om/BucketManager.java | 79 - .../hadoop/ozone/om/BucketManagerImpl.java | 303 ---- .../hadoop/ozone/om/KeyDeletingService.java | 172 --- .../org/apache/hadoop/ozone/om/KeyManager.java | 179 --- .../apache/hadoop/ozone/om/KeyManagerImpl.java | 544 ------- .../org/apache/hadoop/ozone/om/OMMXBean.java | 31 - .../hadoop/ozone/om/OMMetadataManager.java | 239 --- .../org/apache/hadoop/ozone/om/OMMetrics.java | 459 ------ .../org/apache/hadoop/ozone/om/OMStorage.java | 90 -- .../hadoop/ozone/om/OmMetadataManagerImpl.java | 616 -------- .../hadoop/ozone/om/OpenKeyCleanupService.java | 117 -- .../apache/hadoop/ozone/om/OzoneManager.java | 1158 --------------- .../hadoop/ozone/om/OzoneManagerHttpServer.java | 78 - .../hadoop/ozone/om/OzoneManagerLock.java | 181 --- .../hadoop/ozone/om/ServiceListJSONServlet.java | 103 -- .../apache/hadoop/ozone/om/VolumeManager.java | 100 -- .../hadoop/ozone/om/VolumeManagerImpl.java | 429 ------ .../hadoop/ozone/om/exceptions/OMException.java | 119 -- .../ozone/om/exceptions/package-info.java | 19 - .../apache/hadoop/ozone/om/package-info.java | 21 - ...neManagerProtocolServerSideTranslatorPB.java | 573 -------- .../hadoop/ozone/protocolPB/package-info.java | 22 - .../hadoop/ozone/web/ozShell/Handler.java | 160 -- .../apache/hadoop/ozone/web/ozShell/Shell.java | 80 - .../web/ozShell/bucket/BucketCommands.java | 60 - .../web/ozShell/bucket/CreateBucketHandler.java | 83 -- .../web/ozShell/bucket/DeleteBucketHandler.java | 68 - .../web/ozShell/bucket/InfoBucketHandler.java | 81 -- .../web/ozShell/bucket/ListBucketHandler.java | 118 -- .../web/ozShell/bucket/UpdateBucketHandler.java | 101 -- .../ozone/web/ozShell/bucket/package-info.java | 23 - .../web/ozShell/keys/DeleteKeyHandler.java | 72 - .../ozone/web/ozShell/keys/GetKeyHandler.java | 114 -- .../ozone/web/ozShell/keys/InfoKeyHandler.java | 83 -- .../ozone/web/ozShell/keys/KeyCommands.java | 60 - .../ozone/web/ozShell/keys/ListKeyHandler.java | 120 -- .../ozone/web/ozShell/keys/PutKeyHandler.java | 121 -- .../ozone/web/ozShell/keys/package-info.java | 23 - .../hadoop/ozone/web/ozShell/package-info.java | 27 - .../web/ozShell/volume/CreateVolumeHandler.java | 111 -- .../web/ozShell/volume/DeleteVolumeHandler.java | 63 - .../web/ozShell/volume/InfoVolumeHandler.java | 74 - .../web/ozShell/volume/ListVolumeHandler.java | 117 -- .../web/ozShell/volume/UpdateVolumeHandler.java | 82 -- .../web/ozShell/volume/VolumeCommands.java | 61 - .../ozone/web/ozShell/volume/package-info.java | 23 - .../apache/hadoop/ozone/web/package-info.java | 24 - .../resources/webapps/ozoneManager/index.html | 70 - .../resources/webapps/ozoneManager/main.css | 23 - .../resources/webapps/ozoneManager/main.html | 18 - .../webapps/ozoneManager/om-metrics.html | 44 - .../webapps/ozoneManager/ozoneManager.js | 110 -- .../ozone/om/ScmBlockLocationTestIngClient.java | 178 --- .../hadoop/ozone/om/TestBucketManagerImpl.java | 362 ----- .../hadoop/ozone/om/TestChunkStreams.java | 240 --- .../hadoop/ozone/om/TestKeyDeletingService.java | 201 --- .../hadoop/ozone/om/TestKeyManagerImpl.java | 165 --- .../ozone/om/TestOzoneManagerHttpServer.java | 141 -- .../hadoop/ozone/om/TestOzoneManagerLock.java | 192 --- .../apache/hadoop/ozone/om/package-info.java | 21 - hadoop-ozone/ozonefs/pom.xml | 211 --- .../org/apache/hadoop/fs/ozone/Constants.java | 42 - .../java/org/apache/hadoop/fs/ozone/OzFs.java | 44 - .../hadoop/fs/ozone/OzoneFSInputStream.java | 79 - .../hadoop/fs/ozone/OzoneFSOutputStream.java | 59 - .../apache/hadoop/fs/ozone/OzoneFileSystem.java | 687 --------- .../apache/hadoop/fs/ozone/package-info.java | 30 - .../hadoop/fs/ozone/TestOzoneFSInputStream.java | 153 -- .../fs/ozone/TestOzoneFileInterfaces.java | 231 --- .../contract/ITestOzoneContractCreate.java | 48 - .../contract/ITestOzoneContractDelete.java | 48 - .../contract/ITestOzoneContractDistCp.java | 50 - .../ITestOzoneContractGetFileStatus.java | 61 - .../ozone/contract/ITestOzoneContractMkdir.java | 48 - .../ozone/contract/ITestOzoneContractOpen.java | 47 - .../contract/ITestOzoneContractRename.java | 49 - .../contract/ITestOzoneContractRootDir.java | 51 - .../ozone/contract/ITestOzoneContractSeek.java | 47 - .../hadoop/fs/ozone/contract/OzoneContract.java | 123 -- .../src/test/resources/contract/ozone.xml | 113 -- .../ozonefs/src/test/resources/log4j.properties | 24 - hadoop-ozone/pom.xml | 248 ---- hadoop-ozone/s3gateway/pom.xml | 178 --- .../CommonHeadersContainerResponseFilter.java | 39 - .../apache/hadoop/ozone/s3/EndpointBase.java | 87 -- .../org/apache/hadoop/ozone/s3/Gateway.java | 66 - .../hadoop/ozone/s3/GatewayApplication.java | 29 - .../hadoop/ozone/s3/OzoneClientProducer.java | 48 - .../ozone/s3/OzoneConfigurationHolder.java | 43 - .../hadoop/ozone/s3/S3GatewayConfigKeys.java | 55 - .../hadoop/ozone/s3/S3GatewayHttpServer.java | 85 -- .../hadoop/ozone/s3/VirtualHostStyleFilter.java | 143 -- .../hadoop/ozone/s3/bucket/DeleteBucket.java | 44 - .../hadoop/ozone/s3/bucket/PutBucket.java | 44 - .../hadoop/ozone/s3/bucket/package-info.java | 30 - .../ozone/s3/commontypes/CommonPrefix.java | 47 - .../ozone/s3/commontypes/IsoDateAdapter.java | 47 - .../ozone/s3/commontypes/KeyMetadata.java | 87 -- .../ozone/s3/commontypes/package-info.java | 29 - .../hadoop/ozone/s3/exception/OS3Exception.java | 161 --- .../ozone/s3/exception/OS3ExceptionMapper.java | 41 - .../hadoop/ozone/s3/exception/S3ErrorTable.java | 81 -- .../hadoop/ozone/s3/exception/package-info.java | 21 - .../hadoop/ozone/s3/object/DeleteObject.java | 51 - .../hadoop/ozone/s3/object/HeadObject.java | 58 - .../hadoop/ozone/s3/object/ListObject.java | 119 -- .../ozone/s3/object/ListObjectResponse.java | 147 -- .../hadoop/ozone/s3/object/PutObject.java | 61 - .../hadoop/ozone/s3/object/package-info.java | 29 - .../apache/hadoop/ozone/s3/package-info.java | 22 - .../src/main/resources/META-INF/beans.xml | 20 - .../webapps/s3gateway/WEB-INF/beans.xml | 20 - .../resources/webapps/s3gateway/WEB-INF/web.xml | 36 - .../hadoop/ozone/client/ObjectStoreStub.java | 110 -- .../hadoop/ozone/client/OzoneBucketStub.java | 143 -- .../hadoop/ozone/client/OzoneClientStub.java | 37 - .../hadoop/ozone/client/OzoneVolumeStub.java | 95 -- .../hadoop/ozone/client/package-info.java | 21 - .../ozone/s3/TestVirtualHostStyleFilter.java | 163 --- .../ozone/s3/bucket/TestBucketResponse.java | 40 - .../hadoop/ozone/s3/bucket/TestGetBucket.java | 114 -- .../hadoop/ozone/s3/bucket/package-info.java | 21 - .../ozone/s3/exception/TestOS3Exception.java | 49 - .../hadoop/ozone/s3/exception/package-info.java | 22 - .../ozone/s3/object/TestDeleteObject.java | 56 - .../hadoop/ozone/s3/object/package-info.java | 21 - .../apache/hadoop/ozone/s3/package-info.java | 21 - .../tools/dev-support/findbugsExcludeFile.xml | 19 - hadoop-ozone/tools/pom.xml | 95 -- .../org/apache/hadoop/ozone/freon/Freon.java | 39 - .../hadoop/ozone/freon/RandomKeyGenerator.java | 1039 ------------- .../apache/hadoop/ozone/freon/package-info.java | 22 - .../GenerateOzoneRequiredConfigurations.java | 148 -- .../hadoop/ozone/genconf/package-info.java | 24 - .../genesis/BenchMarkContainerStateMap.java | 213 --- .../genesis/BenchMarkDatanodeDispatcher.java | 317 ---- .../genesis/BenchMarkMetadataStoreReads.java | 67 - .../genesis/BenchMarkMetadataStoreWrites.java | 60 - .../ozone/genesis/BenchMarkRocksDbStore.java | 115 -- .../apache/hadoop/ozone/genesis/Genesis.java | 60 - .../ozone/genesis/GenesisMemoryProfiler.java | 61 - .../hadoop/ozone/genesis/GenesisUtil.java | 96 -- .../hadoop/ozone/genesis/package-info.java | 25 - .../org/apache/hadoop/ozone/scm/cli/SQLCLI.java | 567 -------- .../hadoop/ozone/scm/cli/package-info.java | 22 - .../hadoop/ozone/freon/TestDataValidate.java | 115 -- .../ozone/freon/TestRandomKeyGenerator.java | 106 -- ...TestGenerateOzoneRequiredConfigurations.java | 213 --- .../hadoop/ozone/genconf/package-info.java | 22 - .../apache/hadoop/ozone/om/TestOmSQLCli.java | 285 ---- .../hadoop/ozone/scm/TestContainerSQLCli.java | 253 ---- .../org/apache/hadoop/test/OzoneTestDriver.java | 59 - hadoop-project/pom.xml | 114 -- hadoop-project/src/site/site.xml | 9 - pom.xml | 71 - 1028 files changed, 1 insertion(+), 138911 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c392da8/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index ac245c7..fc742c1 100644 --- a/.gitignore +++ b/.gitignore @@ -51,13 +51,3 @@ patchprocess/ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package-lock.json hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn-error.log -# Ignore files generated by HDDS acceptance tests. -hadoop-ozone/acceptance-test/docker-compose.log -hadoop-ozone/acceptance-test/junit-results.xml - -#robotframework outputs -log.html -output.xml -report.html - -hadoop-ozone/docs/public http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c392da8/dev-support/bin/dist-layout-stitching ---------------------------------------------------------------------- diff --git a/dev-support/bin/dist-layout-stitching b/dev-support/bin/dist-layout-stitching index 584821a..97d544b 100755 --- a/dev-support/bin/dist-layout-stitching +++ b/dev-support/bin/dist-layout-stitching @@ -21,9 +21,6 @@ VERSION=$1 # project.build.directory BASEDIR=$2 -#hdds.version -HDDS_VERSION=$3 - function run() { declare res http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c392da8/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdds.xml ---------------------------------------------------------------------- diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdds.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdds.xml deleted file mode 100644 index b1e039f..0000000 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdds.xml +++ /dev/null @@ -1,56 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> - <id>hadoop-src</id> - <formats> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>.</directory> - <includes> - <include>LICENCE.txt</include> - <include>README.txt</include> - <include>NOTICE.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>.</directory> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <exclude>.git/**</exclude> - <exclude>**/.gitignore</exclude> - <exclude>**/.svn</exclude> - <exclude>**/*.iws</exclude> - <exclude>**/*.ipr</exclude> - <exclude>**/*.iml</exclude> - <exclude>**/.classpath</exclude> - <exclude>**/.project</exclude> - <exclude>**/.settings</exclude> - <exclude>**/target/**</exclude> - <!-- until the code that does this is fixed --> - <exclude>**/*.log</exclude> - <exclude>**/build/**</exclude> - <exclude>**/file:/**</exclude> - <exclude>**/SecurityAuth.audit*</exclude> - </excludes> - </fileSet> - </fileSets> -</assembly> http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c392da8/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 f0a8d44..b1e039f 100644 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml @@ -50,8 +50,6 @@ <exclude>**/build/**</exclude> <exclude>**/file:/**</exclude> <exclude>**/SecurityAuth.audit*</exclude> - <exclude>hadoop-ozone/**</exclude> - <exclude>hadoop-hdds/**</exclude> </excludes> </fileSet> </fileSets> http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c392da8/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh index 71ba7ff..f0daafd 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh @@ -596,11 +596,6 @@ function hadoop_bootstrap YARN_LIB_JARS_DIR=${YARN_LIB_JARS_DIR:-"share/hadoop/yarn/lib"} MAPRED_DIR=${MAPRED_DIR:-"share/hadoop/mapreduce"} MAPRED_LIB_JARS_DIR=${MAPRED_LIB_JARS_DIR:-"share/hadoop/mapreduce/lib"} - HDDS_DIR=${HDDS_DIR:-"share/hadoop/hdds"} - HDDS_LIB_JARS_DIR=${HDDS_LIB_JARS_DIR:-"share/hadoop/hdds/lib"} - OZONE_DIR=${OZONE_DIR:-"share/hadoop/ozone"} - OZONE_LIB_JARS_DIR=${OZONE_LIB_JARS_DIR:-"share/hadoop/ozone/lib"} - OZONEFS_DIR=${OZONEFS_DIR:-"share/hadoop/ozonefs"} HADOOP_TOOLS_HOME=${HADOOP_TOOLS_HOME:-${HADOOP_HOME}} HADOOP_TOOLS_DIR=${HADOOP_TOOLS_DIR:-"share/hadoop/tools"} http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c392da8/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh index 6db085a..029fc40 100644 --- a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh +++ b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh @@ -404,15 +404,6 @@ esac # export HDFS_DFSROUTER_OPTS="" ### -# Ozone Manager specific parameters -### -# Specify the JVM options to be used when starting the Ozone Manager. -# These options will be appended to the options specified as HADOOP_OPTS -# and therefore may override any similar flags set in HADOOP_OPTS -# -# export HDFS_OM_OPTS="" - -### # HDFS StorageContainerManager specific parameters ### # Specify the JVM options to be used when starting the HDFS Storage Container Manager. http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c392da8/hadoop-hdds/client/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml deleted file mode 100644 index 53d72bb..0000000 --- a/hadoop-hdds/client/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. See accompanying LICENSE file. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 -http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds</artifactId> - <version>0.3.0-SNAPSHOT</version> - </parent> - - <artifactId>hadoop-hdds-client</artifactId> - <version>0.3.0-SNAPSHOT</version> - <description>Apache Hadoop Distributed Data Store Client Library</description> - <name>Apache Hadoop HDDS Client</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-common</artifactId> - </dependency> - - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </dependency> - - </dependencies> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c392da8/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java deleted file mode 100644 index d353e7a..0000000 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.hdds.scm; - -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdds.protocol.DatanodeDetails; -import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto; -import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto; -import org.apache.hadoop.hdds.protocol.datanode.proto.XceiverClientProtocolServiceGrpc; -import org.apache.hadoop.hdds.protocol.datanode.proto.XceiverClientProtocolServiceGrpc.XceiverClientProtocolServiceStub; -import org.apache.hadoop.hdds.protocol.proto.HddsProtos; -import org.apache.hadoop.hdds.scm.client.HddsClientUtils; -import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline; -import org.apache.hadoop.ozone.OzoneConfigKeys; -import org.apache.hadoop.util.Time; -import org.apache.ratis.shaded.io.grpc.ManagedChannel; -import org.apache.ratis.shaded.io.grpc.netty.NettyChannelBuilder; -import org.apache.ratis.shaded.io.grpc.stub.StreamObserver; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Semaphore; -import java.util.concurrent.TimeUnit; - -/** - * A Client for the storageContainer protocol. - */ -public class XceiverClientGrpc extends XceiverClientSpi { - static final Logger LOG = LoggerFactory.getLogger(XceiverClientGrpc.class); - private final Pipeline pipeline; - private final Configuration config; - private XceiverClientProtocolServiceStub asyncStub; - private XceiverClientMetrics metrics; - private ManagedChannel channel; - private final Semaphore semaphore; - private boolean closed = false; - - /** - * Constructs a client that can communicate with the Container framework on - * data nodes. - * - * @param pipeline - Pipeline that defines the machines. - * @param config -- Ozone Config - */ - public XceiverClientGrpc(Pipeline pipeline, Configuration config) { - super(); - Preconditions.checkNotNull(pipeline); - Preconditions.checkNotNull(config); - this.pipeline = pipeline; - this.config = config; - this.semaphore = - new Semaphore(HddsClientUtils.getMaxOutstandingRequests(config)); - this.metrics = XceiverClientManager.getXceiverClientMetrics(); - } - - @Override - public void connect() throws Exception { - DatanodeDetails leader = this.pipeline.getLeader(); - - // read port from the data node, on failure use default configured - // port. - int port = leader.getPort(DatanodeDetails.Port.Name.STANDALONE).getValue(); - if (port == 0) { - port = config.getInt(OzoneConfigKeys.DFS_CONTAINER_IPC_PORT, - OzoneConfigKeys.DFS_CONTAINER_IPC_PORT_DEFAULT); - } - LOG.debug("Connecting to server Port : " + leader.getIpAddress()); - channel = NettyChannelBuilder.forAddress(leader.getIpAddress(), port) - .usePlaintext() - .maxInboundMessageSize(OzoneConfigKeys.DFS_CONTAINER_CHUNK_MAX_SIZE) - .build(); - asyncStub = XceiverClientProtocolServiceGrpc.newStub(channel); - } - - /** - * Returns if the xceiver client connects to a server. - * - * @return True if the connection is alive, false otherwise. - */ - @VisibleForTesting - public boolean isConnected() { - return !channel.isTerminated() && !channel.isShutdown(); - } - - @Override - public void close() { - closed = true; - channel.shutdownNow(); - try { - channel.awaitTermination(60, TimeUnit.MINUTES); - } catch (Exception e) { - LOG.error("Unexpected exception while waiting for channel termination", - e); - } - } - - @Override - public Pipeline getPipeline() { - return pipeline; - } - - /** - * Sends a given command to server gets a waitable future back. - * - * @param request Request - * @return Response to the command - * @throws IOException - */ - @Override - public CompletableFuture<ContainerCommandResponseProto> - sendCommandAsync(ContainerCommandRequestProto request) - throws IOException, ExecutionException, InterruptedException { - if(closed){ - throw new IOException("This channel is not connected."); - } - - if(channel == null || !isConnected()) { - reconnect(); - } - - final CompletableFuture<ContainerCommandResponseProto> replyFuture = - new CompletableFuture<>(); - semaphore.acquire(); - long requestTime = Time.monotonicNowNanos(); - metrics.incrPendingContainerOpsMetrics(request.getCmdType()); - // create a new grpc stream for each non-async call. - final StreamObserver<ContainerCommandRequestProto> requestObserver = - asyncStub.send(new StreamObserver<ContainerCommandResponseProto>() { - @Override - public void onNext(ContainerCommandResponseProto value) { - replyFuture.complete(value); - metrics.decrPendingContainerOpsMetrics(request.getCmdType()); - metrics.addContainerOpsLatency(request.getCmdType(), - Time.monotonicNowNanos() - requestTime); - semaphore.release(); - } - @Override - public void onError(Throwable t) { - replyFuture.completeExceptionally(t); - metrics.decrPendingContainerOpsMetrics(request.getCmdType()); - metrics.addContainerOpsLatency(request.getCmdType(), - Time.monotonicNowNanos() - requestTime); - semaphore.release(); - } - - @Override - public void onCompleted() { - if (!replyFuture.isDone()) { - replyFuture.completeExceptionally( - new IOException("Stream completed but no reply for request " - + request)); - } - } - }); - requestObserver.onNext(request); - requestObserver.onCompleted(); - return replyFuture; - } - - private void reconnect() throws IOException { - try { - connect(); - } catch (Exception e) { - LOG.error("Error while connecting: ", e); - throw new IOException(e); - } - - if (channel == null || !isConnected()) { - throw new IOException("This channel is not connected."); - } - } - - /** - * Create a pipeline. - */ - @Override - public void createPipeline() { - // For stand alone pipeline, there is no notion called setup pipeline. - } - - public void destroyPipeline() { - // For stand alone pipeline, there is no notion called destroy pipeline. - } - - /** - * Returns pipeline Type. - * - * @return - Stand Alone as the type. - */ - @Override - public HddsProtos.ReplicationType getPipelineType() { - return HddsProtos.ReplicationType.STAND_ALONE; - } -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c392da8/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientManager.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientManager.java deleted file mode 100644 index 9762406..0000000 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientManager.java +++ /dev/null @@ -1,224 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.hdds.scm; - -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.RemovalListener; -import com.google.common.cache.RemovalNotification; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline; -import org.apache.hadoop.hdds.protocol.proto.HddsProtos; - -import java.io.Closeable; -import java.io.IOException; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; - -import static org.apache.hadoop.hdds.scm.ScmConfigKeys - .SCM_CONTAINER_CLIENT_MAX_SIZE_DEFAULT; -import static org.apache.hadoop.hdds.scm.ScmConfigKeys - .SCM_CONTAINER_CLIENT_MAX_SIZE_KEY; -import static org.apache.hadoop.hdds.scm.ScmConfigKeys - .SCM_CONTAINER_CLIENT_STALE_THRESHOLD_DEFAULT; -import static org.apache.hadoop.hdds.scm.ScmConfigKeys - .SCM_CONTAINER_CLIENT_STALE_THRESHOLD_KEY; - -/** - * XceiverClientManager is responsible for the lifecycle of XceiverClient - * instances. Callers use this class to acquire an XceiverClient instance - * connected to the desired container pipeline. When done, the caller also uses - * this class to release the previously acquired XceiverClient instance. - * - * - * This class caches connection to container for reuse purpose, such that - * accessing same container frequently will be through the same connection - * without reestablishing connection. But the connection will be closed if - * not being used for a period of time. - */ -public class XceiverClientManager implements Closeable { - - //TODO : change this to SCM configuration class - private final Configuration conf; - private final Cache<Long, XceiverClientSpi> clientCache; - private final boolean useRatis; - - private static XceiverClientMetrics metrics; - /** - * Creates a new XceiverClientManager. - * - * @param conf configuration - */ - public XceiverClientManager(Configuration conf) { - Preconditions.checkNotNull(conf); - int maxSize = conf.getInt(SCM_CONTAINER_CLIENT_MAX_SIZE_KEY, - SCM_CONTAINER_CLIENT_MAX_SIZE_DEFAULT); - long staleThresholdMs = conf.getTimeDuration( - SCM_CONTAINER_CLIENT_STALE_THRESHOLD_KEY, - SCM_CONTAINER_CLIENT_STALE_THRESHOLD_DEFAULT, TimeUnit.MILLISECONDS); - this.useRatis = conf.getBoolean( - ScmConfigKeys.DFS_CONTAINER_RATIS_ENABLED_KEY, - ScmConfigKeys.DFS_CONTAINER_RATIS_ENABLED_DEFAULT); - this.conf = conf; - this.clientCache = CacheBuilder.newBuilder() - .expireAfterAccess(staleThresholdMs, TimeUnit.MILLISECONDS) - .maximumSize(maxSize) - .removalListener( - new RemovalListener<Long, XceiverClientSpi>() { - @Override - public void onRemoval( - RemovalNotification<Long, XceiverClientSpi> - removalNotification) { - synchronized (clientCache) { - // Mark the entry as evicted - XceiverClientSpi info = removalNotification.getValue(); - info.setEvicted(); - } - } - }).build(); - } - - @VisibleForTesting - public Cache<Long, XceiverClientSpi> getClientCache() { - return clientCache; - } - - /** - * Acquires a XceiverClientSpi connected to a container capable of - * storing the specified key. - * - * If there is already a cached XceiverClientSpi, simply return - * the cached otherwise create a new one. - * - * @param pipeline the container pipeline for the client connection - * @return XceiverClientSpi connected to a container - * @throws IOException if a XceiverClientSpi cannot be acquired - */ - public XceiverClientSpi acquireClient(Pipeline pipeline, long containerID) - throws IOException { - Preconditions.checkNotNull(pipeline); - Preconditions.checkArgument(pipeline.getMachines() != null); - Preconditions.checkArgument(!pipeline.getMachines().isEmpty()); - - synchronized (clientCache) { - XceiverClientSpi info = getClient(pipeline, containerID); - info.incrementReference(); - return info; - } - } - - /** - * Releases a XceiverClientSpi after use. - * - * @param client client to release - */ - public void releaseClient(XceiverClientSpi client) { - Preconditions.checkNotNull(client); - synchronized (clientCache) { - client.decrementReference(); - } - } - - private XceiverClientSpi getClient(Pipeline pipeline, long containerID) - throws IOException { - try { - return clientCache.get(containerID, - new Callable<XceiverClientSpi>() { - @Override - public XceiverClientSpi call() throws Exception { - XceiverClientSpi client = null; - switch (pipeline.getType()) { - case RATIS: - client = XceiverClientRatis.newXceiverClientRatis(pipeline, conf); - break; - case STAND_ALONE: - client = new XceiverClientGrpc(pipeline, conf); - break; - case CHAINED: - default: - throw new IOException("not implemented" + pipeline.getType()); - } - client.connect(); - return client; - } - }); - } catch (Exception e) { - throw new IOException( - "Exception getting XceiverClient: " + e.toString(), e); - } - } - - /** - * Close and remove all the cached clients. - */ - public void close() { - //closing is done through RemovalListener - clientCache.invalidateAll(); - clientCache.cleanUp(); - - if (metrics != null) { - metrics.unRegister(); - } - } - - /** - * Tells us if Ratis is enabled for this cluster. - * @return True if Ratis is enabled. - */ - public boolean isUseRatis() { - return useRatis; - } - - /** - * Returns hard coded 3 as replication factor. - * @return 3 - */ - public HddsProtos.ReplicationFactor getFactor() { - if(isUseRatis()) { - return HddsProtos.ReplicationFactor.THREE; - } - return HddsProtos.ReplicationFactor.ONE; - } - - /** - * Returns the default replication type. - * @return Ratis or Standalone - */ - public HddsProtos.ReplicationType getType() { - // TODO : Fix me and make Ratis default before release. - // TODO: Remove this as replication factor and type are pipeline properties - if(isUseRatis()) { - return HddsProtos.ReplicationType.RATIS; - } - return HddsProtos.ReplicationType.STAND_ALONE; - } - - /** - * Get xceiver client metric. - */ - public synchronized static XceiverClientMetrics getXceiverClientMetrics() { - if (metrics == null) { - metrics = XceiverClientMetrics.create(); - } - - return metrics; - } -} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
