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 ae...@apache.org on 2018/04/19 03:23:40 UTC
[28/28] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Merge branch 'trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/91975886
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/91975886
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/91975886
Branch: refs/heads/HDFS-7240
Commit: 91975886e334aa8d2455e49e9e30db399e41e0cc
Parents: 94cb164 e4c39f3
Author: Anu Engineer <ae...@apache.org>
Authored: Wed Apr 18 20:12:40 2018 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Wed Apr 18 20:12:40 2018 -0700
----------------------------------------------------------------------
.../hadoop/util/GenericOptionsParser.java | 3 +
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 0
.../java/org/apache/hadoop/hdfs/DFSPacket.java | 0
.../org/apache/hadoop/hdfs/TestDFSPacket.java | 0
.../federation/metrics/FederationMetrics.java | 2 +-
.../resolver/order/LocalResolver.java | 3 +-
.../router/RouterHeartbeatService.java | 4 +-
.../federation/router/RouterRpcClient.java | 4 +-
.../federation/router/RouterRpcServer.java | 6 +-
.../federation/store/StateStoreService.java | 2 +-
.../driver/impl/StateStoreFileBaseImpl.java | 2 +-
.../main/webapps/router/federationhealth.html | 17 +-
.../src/main/webapps/router/federationhealth.js | 5 +-
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 6 +-
.../hdfs/qjournal/server/JournalNode.java | 62 +++++-
.../qjournal/server/JournalNodeHttpServer.java | 65 ++++--
.../qjournal/server/JournalNodeRpcServer.java | 30 ++-
.../datanode/fsdataset/impl/FsDatasetImpl.java | 9 +-
.../datanode/fsdataset/impl/FsVolumeList.java | 9 +-
.../OfflineImageReconstructor.java | 4 +-
.../src/main/resources/hdfs-default.xml | 33 +++
.../hdfs/client/impl/BlockReaderTestUtil.java | 5 +
.../TestJournalNodeRespectsBindHostKeys.java | 200 +++++++++++++++++++
.../fsdataset/impl/TestFsDatasetImpl.java | 107 +++++++++-
.../apache/hadoop/hdfs/tools/TestDFSAdmin.java | 80 +++++++-
.../TestOfflineImageViewer.java | 7 +-
.../security/TestRefreshUserMappings.java | 10 +-
.../v2/app/job/impl/TaskAttemptImpl.java | 0
.../mapreduce/v2/app/job/impl/TaskImpl.java | 0
.../mapreduce/v2/app/job/impl/TestTaskImpl.java | 0
.../org/apache/hadoop/mapred/NotRunningJob.java | 2 +-
.../mapred/TestClientServiceDelegate.java | 4 +-
.../apache/hadoop/mapred/TestYARNRunner.java | 3 +-
hadoop-project/pom.xml | 2 +-
hadoop-project/src/site/site.xml | 1 +
.../src/site/resources/css/site.css | 30 +++
.../hadoop-aws/src/site/resources/css/site.css | 30 +++
.../src/site/resources/css/site.css | 30 +++
.../src/site/resources/css/site.css | 30 +++
hadoop-tools/hadoop-sls/pom.xml | 1 +
.../org/apache/hadoop/yarn/sls/SLSRunner.java | 35 +++-
.../apache/hadoop/yarn/sls/utils/SLSUtils.java | 24 ++-
.../hadoop/yarn/sls/utils/TestSLSUtils.java | 25 +++
.../test/resources/nodes-with-resources.json | 19 ++
.../MySQL/FederationStateStoreTables.sql | 2 +-
.../yarn/api/records/ApplicationReport.java | 45 ++++-
.../src/main/proto/yarn_protos.proto | 1 +
.../client/SystemServiceManagerImpl.java | 22 +-
...RN-Simplified-V1-API-Layer-For-Services.yaml | 8 +-
.../hadoop/yarn/service/TestApiServer.java | 45 ++++-
.../service/client/TestSystemServiceImpl.java | 180 -----------------
.../client/TestSystemServiceManagerImpl.java | 182 +++++++++++++++++
.../resources/system-services/bad/bad.yarnfile | 16 ++
.../sync/user1/example-app1.yarnfile | 16 ++
.../sync/user1/example-app2.yarnfile | 16 ++
.../sync/user1/example-app3.json | 16 ++
.../sync/user2/example-app1.yarnfile | 16 ++
.../sync/user2/example-app2.yarnfile | 16 ++
.../users/sync/user1/example-app1.yarnfile | 16 --
.../users/sync/user1/example-app2.yarnfile | 16 --
.../users/sync/user1/example-app3.json | 16 --
.../users/sync/user2/example-app1.yarnfile | 16 --
.../users/sync/user2/example-app2.yarnfile | 16 --
.../yarn/service/ContainerFailureTracker.java | 7 +-
.../hadoop/yarn/service/ServiceMaster.java | 18 +-
.../hadoop/yarn/service/ServiceScheduler.java | 5 +-
.../service/api/records/ReadinessCheck.java | 1 +
.../yarn/service/api/records/Service.java | 24 +++
.../yarn/service/client/ClientAMProxy.java | 5 +-
.../yarn/service/client/ServiceClient.java | 56 +++---
.../yarn/service/component/Component.java | 16 +-
.../component/instance/ComponentInstance.java | 20 ++
.../yarn/service/conf/YarnServiceConf.java | 29 ++-
.../yarn/service/monitor/ServiceMonitor.java | 7 +-
.../service/monitor/probe/DefaultProbe.java | 99 +++++++++
.../yarn/service/monitor/probe/HttpProbe.java | 37 ++--
.../yarn/service/monitor/probe/MonitorKeys.java | 12 ++
.../service/monitor/probe/MonitorUtils.java | 14 +-
.../yarn/service/monitor/probe/PortProbe.java | 24 +--
.../yarn/service/monitor/probe/Probe.java | 18 +-
.../provider/AbstractProviderService.java | 17 +-
.../provider/docker/DockerProviderService.java | 17 +-
.../yarn/service/utils/ServiceApiUtil.java | 21 ++
.../service/utils/ServiceRegistryUtils.java | 60 ++++++
.../hadoop/yarn/service/MockServiceAM.java | 25 +++
.../hadoop/yarn/service/TestServiceAM.java | 50 +++++
.../yarn/service/TestSystemServiceManager.java | 156 ---------------
.../service/monitor/probe/TestDefaultProbe.java | 155 ++++++++++++++
.../hadoop/yarn/client/ProtocolHATestBase.java | 2 +-
.../yarn/client/api/impl/TestAHSClient.java | 8 +-
.../yarn/client/api/impl/TestYarnClient.java | 8 +-
.../hadoop/yarn/client/cli/TestYarnCLI.java | 42 ++--
.../impl/pb/ApplicationReportPBImpl.java | 11 +
.../yarn/util/DockerClientConfigHandler.java | 17 +-
.../hadoop/yarn/api/TestApplicatonReport.java | 2 +-
.../ApplicationHistoryManagerImpl.java | 2 +-
.../hadoop/yarn/server/utils/BuilderUtils.java | 3 +-
.../hadoop/yarn/server/webapp/AppBlock.java | 7 +-
.../hadoop/yarn/server/webapp/AppsBlock.java | 5 +-
.../hadoop/yarn/server/webapp/WebPageUtils.java | 2 +-
.../hadoop/yarn/server/webapp/dao/AppInfo.java | 6 +
.../server/nodemanager/DirectoryCollection.java | 30 ---
.../localizer/ResourceLocalizationService.java | 0
.../TestResourceLocalizationService.java | 0
.../server/resourcemanager/ResourceManager.java | 19 --
.../resourcemanager/amlauncher/AMLauncher.java | 2 +-
.../recovery/records/ApplicationStateData.java | 24 ++-
.../impl/pb/ApplicationStateDataPBImpl.java | 13 ++
.../AbstractSchedulerPlanFollower.java | 5 +-
.../server/resourcemanager/rmapp/RMApp.java | 10 +-
.../resourcemanager/rmapp/RMAppEvent.java | 6 +
.../resourcemanager/rmapp/RMAppEventType.java | 1 +
.../server/resourcemanager/rmapp/RMAppImpl.java | 41 +++-
.../rmapp/attempt/RMAppAttemptEvent.java | 7 +
.../rmapp/attempt/RMAppAttemptImpl.java | 4 +-
.../allocator/AbstractContainerAllocator.java | 9 +-
.../scheduler/fair/AllocationConfiguration.java | 20 --
.../webapp/FairSchedulerAppsBlock.java | 2 +
.../resourcemanager/webapp/RMAppsBlock.java | 2 +
.../resourcemanager/webapp/dao/AppInfo.java | 6 +
.../yarn_server_resourcemanager_recovery.proto | 1 +
.../resourcemanager/TestRMAdminService.java | 2 +
.../applicationsmanager/MockAsm.java | 15 +-
.../TestUserGroupMappingPlacementRule.java | 0
.../recovery/RMStateStoreTestBase.java | 4 +-
.../recovery/TestFSRMStateStore.java | 2 +-
.../recovery/TestZKRMStateStore.java | 2 +-
.../server/resourcemanager/rmapp/MockRMApp.java | 6 +
.../rmapp/TestRMAppTransitions.java | 2 +-
.../fair/TestAllocationFileLoaderService.java | 35 ----
.../resourcemanager/webapp/TestRMWebApp.java | 2 +-
.../webapp/TestRMWebServicesApps.java | 14 +-
.../server/webproxy/amfilter/AmIpFilter.java | 13 +-
.../server/webproxy/amfilter/TestAmFilter.java | 40 ++++
.../markdown/yarn-service/Configurations.md | 127 +++++++++---
.../markdown/yarn-service/SystemServices.md | 66 ++++++
.../markdown/yarn-service/YarnServiceAPI.md | 7 +-
.../main/webapp/app/models/yarn-app-attempt.js | 5 +
.../templates/components/app-attempt-table.hbs | 2 +-
139 files changed, 2297 insertions(+), 829 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/91975886/hadoop-project/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/91975886/hadoop-project/src/site/site.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org