Merge branch 'trunk' into HDFS-12943
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e62a4cf8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e62a4cf8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e62a4cf8 Branch: refs/heads/HDFS-12943 Commit: e62a4cf8e8360913e1714697aa8aeb6442dcf938 Parents: 038bdbc e815fd9 Author: Konstantin V Shvachko <[email protected]> Authored: Wed Dec 19 12:31:54 2018 -0800 Committer: Konstantin V Shvachko <[email protected]> Committed: Wed Dec 19 12:31:54 2018 -0800 ---------------------------------------------------------------------- .../hdds/scm/storage/BlockOutputStream.java | 627 ++++++++ .../hdds/scm/storage/ChunkOutputStream.java | 627 -------- .../apache/hadoop/hdds/scm/ScmConfigKeys.java | 23 +- .../common/helpers/ContainerWithPipeline.java | 7 +- .../hadoop/hdds/scm/pipeline/Pipeline.java | 38 +- .../pipeline/UnknownPipelineStateException.java | 46 + ...rLocationProtocolClientSideTranslatorPB.java | 9 +- .../apache/hadoop/ozone/OzoneConfigKeys.java | 23 +- ...rLocationProtocolServerSideTranslatorPB.java | 8 +- .../main/java/org/apache/ratis/RatisHelper.java | 2 +- hadoop-hdds/common/src/main/proto/hdds.proto | 8 +- .../common/src/main/resources/ozone-default.xml | 51 +- .../hadoop/ozone/HddsDatanodeService.java | 118 +- .../server/ratis/ContainerStateMachine.java | 10 +- .../server/ratis/XceiverServerRatis.java | 32 +- .../hadoop/ozone/TestHddsDatanodeService.java | 3 +- hadoop-hdds/docs/content/genconf.md | 28 + hadoop-hdds/pom.xml | 2 +- .../hdds/scm/pipeline/RatisPipelineUtils.java | 2 +- .../hdds/scm/pipeline/SCMPipelineManager.java | 6 +- .../apache/hadoop/mapred/ShuffleHandler.java | 3 + .../ozone/client/io/ChunkGroupOutputStream.java | 812 ----------- .../hadoop/ozone/client/io/KeyOutputStream.java | 812 +++++++++++ .../ozone/client/io/OzoneOutputStream.java | 8 +- .../hadoop/ozone/client/rpc/RpcClient.java | 10 +- .../apache/hadoop/ozone/om/OMConfigKeys.java | 14 +- .../compose/common/grafana/conf/grafana.ini | 20 + .../dashboards/Ozone - Object Metrics.json | 1344 ++++++++++++++++++ .../grafana/dashboards/Ozone - RPC Metrics.json | 875 ++++++++++++ .../provisioning/dashboards/dashboards.yml | 22 + .../provisioning/datasources/datasources.yml | 25 + .../compose/common/prometheus/prometheus.yml | 25 + .../dist/src/main/compose/ozoneperf/README.md | 16 +- .../main/compose/ozoneperf/docker-compose.yaml | 11 +- .../src/main/compose/ozoneperf/docker-config | 3 +- .../src/main/compose/ozoneperf/prometheus.yml | 25 - .../hadoop/ozone/MiniOzoneClusterImpl.java | 6 +- .../org/apache/hadoop/ozone/OzoneTestUtils.java | 2 +- .../rpc/TestCloseContainerHandlingByClient.java | 54 +- .../rpc/TestContainerStateMachineFailures.java | 6 +- .../client/rpc/TestFailureHandlingByClient.java | 20 +- .../ozone/client/rpc/TestOzoneRpcClient.java | 6 +- .../transport/server/ratis/TestCSMMetrics.java | 2 +- .../ozoneimpl/TestOzoneContainerRatis.java | 2 +- .../container/server/TestContainerServer.java | 2 +- .../hadoop/ozone/om/TestOzoneManager.java | 28 +- .../ozone/ozShell/TestOzoneDatanodeShell.java | 250 ++++ .../web/storage/DistributedStorageHandler.java | 6 +- .../hadoop/ozone/om/OmMetadataManagerImpl.java | 1 - .../ozone/om/ratis/OzoneManagerRatisServer.java | 18 +- .../hadoop/ozone/om/TestChunkStreams.java | 2 +- .../hadoop/fs/ozone/OzoneFSOutputStream.java | 6 +- hadoop-ozone/pom.xml | 2 +- .../hadoop/yarn/conf/YarnConfiguration.java | 10 +- .../yarn/service/UpgradeComponentsFinder.java | 6 - .../component/instance/ComponentInstance.java | 50 +- .../yarn/service/TestYarnNativeServices.java | 8 +- .../src/main/resources/yarn-default.xml | 15 + .../hadoop/yarn/server/nodemanager/Context.java | 5 + .../yarn/server/nodemanager/NodeManager.java | 13 + .../containermanager/AuxServices.java | 809 ++++++++--- .../AuxiliaryServiceWithCustomClassLoader.java | 8 +- .../containermanager/ContainerManagerImpl.java | 1 + .../launcher/ContainerLaunch.java | 3 + .../launcher/ContainersLauncher.java | 50 +- .../records/AuxServiceConfiguration.java | 137 ++ .../records/AuxServiceFile.java | 137 ++ .../records/AuxServiceRecord.java | 175 +++ .../records/AuxServiceRecords.java | 46 + .../containermanager/records/package-info.java | 29 + .../webapp/ContainerShellWebSocket.java | 19 + .../nodemanager/webapp/NMWebServices.java | 37 + .../webapp/dao/AuxiliaryServiceInfo.java | 60 + .../webapp/dao/AuxiliaryServicesInfo.java | 55 + .../main/resources/TERMINAL/terminal.template | 3 + .../amrmproxy/BaseAMRMProxyTest.java | 10 + .../containermanager/TestAuxServices.java | 330 +++-- .../launcher/TestContainersLauncher.java | 14 +- .../nodemanager/webapp/TestNMWebTerminal.java | 2 +- 79 files changed, 6130 insertions(+), 2010 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
