Merge branch 'YARN-5734-branch-3.0' into branch-3.0. (xgong)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fa676ba0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fa676ba0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fa676ba0 Branch: refs/heads/branch-3.0 Commit: fa676ba06b4039f35363e211a8e91ad15170737f Parents: 1d11701 043a217 Author: Xuan <xg...@apache.org> Authored: Mon Oct 9 15:00:48 2017 -0700 Committer: Xuan <xg...@apache.org> Committed: Mon Oct 9 15:00:48 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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
