You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2016/06/09 13:52:59 UTC
ambari git commit: AMBARI-17121 Unit-test failing coz of issue "YARN
service check fails if there is no queue named 'default'" (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk f4dae12eb -> b57a7cfa2
AMBARI-17121 Unit-test failing coz of issue "YARN service check fails if there is no queue named 'default'" (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b57a7cfa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b57a7cfa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b57a7cfa
Branch: refs/heads/trunk
Commit: b57a7cfa2ff4d2668dc421826ffaa84e8425d26a
Parents: f4dae12
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Jun 9 16:52:32 2016 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Jun 9 16:52:47 2016 +0300
----------------------------------------------------------------------
.../YARN/2.1.0.2.0/package/scripts/params_linux.py | 2 +-
.../src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py | 2 ++
ambari-server/src/test/python/stacks/2.0.6/configs/default.json | 3 ++-
ambari-server/src/test/python/stacks/2.0.6/configs/secured.json | 3 ++-
ambari-server/src/test/python/stacks/2.1/configs/default.json | 3 ++-
ambari-server/src/test/python/stacks/2.1/configs/secured.json | 3 ++-
6 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b57a7cfa/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index 4d281a8..29fb3c1 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -173,7 +173,7 @@ mapred_log_dir_prefix = config['configurations']['mapred-env']['mapred_log_dir_p
mapred_env_sh_template = config['configurations']['mapred-env']['content']
yarn_env_sh_template = config['configurations']['yarn-env']['content']
yarn_nodemanager_recovery_dir = default('/configurations/yarn-site/yarn.nodemanager.recovery.dir', None)
-service_check_queue_name = config['configurations']['yarn-env']['service_check.queue.name']
+service_check_queue_name = default('/configurations/yarn-env/service_check.queue.name','default')
if len(rm_hosts) > 1:
additional_rm_host = rm_hosts[1]
http://git-wip-us.apache.org/repos/asf/ambari/blob/b57a7cfa/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index b7c19ec..c2fd8a7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -1392,6 +1392,8 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
def validateYARNEnvConfigurations(self, properties, recommendedDefaults, configurations, services, hosts):
validationItems = [ ]
+ if not services:
+ return self.toConfigurationValidationProblems(validationItems, "yarn-env")
yarnEnvProperties = getSiteProperties(configurations, "yarn-env")
capacity_scheduler_properties, received_as_key_value_pair = self.getCapacitySchedulerProperties(services)
leafQueueNames = self.getAllYarnLeafQueues(capacity_scheduler_properties)
http://git-wip-us.apache.org/repos/asf/ambari/blob/b57a7cfa/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 86138d1..04aa828 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -546,7 +546,8 @@
"resourcemanager_heapsize": "1024",
"yarn_log_dir_prefix": "/var/log/hadoop-yarn",
"min_user_id": "1000",
- "is_supported_yarn_ranger": "false"
+ "is_supported_yarn_ranger": "false",
+ "service_check.queue.name": "default"
},
"hadoop-env": {
"hdfs_tmp_dir": "/tmp",
http://git-wip-us.apache.org/repos/asf/ambari/blob/b57a7cfa/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 2957c6f..02f982e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -598,7 +598,8 @@
"resourcemanager_heapsize": "1024",
"yarn_log_dir_prefix": "/var/log/hadoop-yarn",
"min_user_id": "1000",
- "is_supported_yarn_ranger": "false"
+ "is_supported_yarn_ranger": "false",
+ "service_check.queue.name": "default"
},
"cluster-env": {
"managed_hdfs_resource_property_names": "",
http://git-wip-us.apache.org/repos/asf/ambari/blob/b57a7cfa/ambari-server/src/test/python/stacks/2.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json
index a6bcc24..fa36607 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json
@@ -615,7 +615,8 @@
"yarn_user": "yarn",
"resourcemanager_heapsize": "1024",
"yarn_log_dir_prefix": "/var/log/hadoop-yarn",
- "is_supported_yarn_ranger": "false"
+ "is_supported_yarn_ranger": "false",
+ "service_check.queue.name": "default"
},
"hadoop-env": {
"namenode_opt_maxnewsize": "200m",
http://git-wip-us.apache.org/repos/asf/ambari/blob/b57a7cfa/ambari-server/src/test/python/stacks/2.1/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
index 80daddf..ae62dba 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
@@ -595,7 +595,8 @@
"yarn_user": "yarn",
"resourcemanager_heapsize": "1024",
"yarn_log_dir_prefix": "/var/log/hadoop-yarn",
- "is_supported_yarn_ranger": "false"
+ "is_supported_yarn_ranger": "false",
+ "service_check.queue.name": "default"
},
"cluster-env": {
"managed_hdfs_resource_property_names": "",