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 su...@apache.org on 2017/10/12 09:37:49 UTC
[22/50] [abbrv] hadoop git commit: Merge branch 'YARN-5734' into
trunk. (xgong)
Merge branch 'YARN-5734' into trunk. (xgong)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f9ff17f5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f9ff17f5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f9ff17f5
Branch: refs/heads/YARN-5881
Commit: f9ff17f510517ef6c6acc1e1179a68e771df1847
Parents: 7938208 1d36b53
Author: Xuan <xg...@apache.org>
Authored: Mon Oct 9 14:46:02 2017 -0700
Committer: Xuan <xg...@apache.org>
Committed: Mon Oct 9 14:46:02 2017 -0700
----------------------------------------------------------------------
hadoop-yarn-project/hadoop-yarn/bin/yarn | 4 +
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 6 +
.../hadoop/yarn/conf/YarnConfiguration.java | 61 +++
.../hadoop/yarn/client/cli/SchedConfCLI.java | 254 ++++++++++
.../yarn/client/cli/TestSchedConfCLI.java | 158 ++++++
.../hadoop/yarn/webapp/dao/QueueConfigInfo.java | 57 +++
.../yarn/webapp/dao/SchedConfUpdateInfo.java | 85 ++++
.../hadoop/yarn/webapp/dao/package-info.java | 27 +
.../yarn/webapp/util/YarnWebServiceUtils.java | 14 +
.../src/main/resources/yarn-default.xml | 64 +++
.../server/resourcemanager/AdminService.java | 24 +-
.../server/resourcemanager/ResourceManager.java | 24 +-
.../RMStateVersionIncompatibleException.java | 2 +-
.../recovery/ZKRMStateStore.java | 5 +-
.../ConfigurationMutationACLPolicy.java | 47 ++
.../ConfigurationMutationACLPolicyFactory.java | 49 ++
.../DefaultConfigurationMutationACLPolicy.java | 45 ++
.../scheduler/MutableConfScheduler.java | 53 ++
.../scheduler/MutableConfigurationProvider.java | 66 +++
.../scheduler/capacity/CapacityScheduler.java | 66 ++-
.../capacity/CapacitySchedulerContext.java | 6 +
.../capacity/CapacitySchedulerQueueManager.java | 11 +-
.../capacity/conf/CSConfigurationProvider.java | 47 ++
.../conf/FileBasedCSConfigurationProvider.java | 67 +++
.../conf/InMemoryConfigurationStore.java | 95 ++++
.../conf/LeveldbConfigurationStore.java | 322 ++++++++++++
.../conf/MutableCSConfigurationProvider.java | 284 +++++++++++
...ueueAdminConfigurationMutationACLPolicy.java | 110 ++++
.../capacity/conf/YarnConfigurationStore.java | 178 +++++++
.../conf/YarnConfigurationStoreFactory.java | 46 ++
.../capacity/conf/ZKConfigurationStore.java | 235 +++++++++
.../scheduler/capacity/conf/package-info.java | 29 ++
.../resourcemanager/webapp/RMWebServices.java | 66 ++-
.../resourcemanager/TestRMAdminService.java | 23 +
.../TestConfigurationMutationACLPolicies.java | 172 +++++++
.../capacity/TestCapacityScheduler.java | 4 +-
.../conf/ConfigurationStoreBaseTest.java | 92 ++++
.../conf/TestInMemoryConfigurationStore.java | 30 ++
.../conf/TestLeveldbConfigurationStore.java | 211 ++++++++
.../TestMutableCSConfigurationProvider.java | 102 ++++
.../capacity/conf/TestZKConfigurationStore.java | 412 +++++++++++++++
.../TestRMWebServicesConfigurationMutation.java | 507 +++++++++++++++++++
.../src/site/markdown/CapacityScheduler.md | 25 +-
.../src/site/markdown/ResourceManagerRest.md | 188 +++++++
.../src/site/markdown/YarnCommands.md | 13 +
45 files changed, 4338 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org