ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: Revert "AMBARI-15557 YARN service check fails if there is no queue named "default" (dsen)"
Date Tue, 29 Mar 2016 22:16:53 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 5738dd4cb -> e23ed7bf3


Revert "AMBARI-15557 YARN service check fails if there is no queue named "default" (dsen)"

This reverts commit 8f24e155112b1f35c6163cb368cc706127c086d3.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e23ed7bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e23ed7bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e23ed7bf

Branch: refs/heads/trunk
Commit: e23ed7bf334f0c9736dc78f5b1166200b1a07d28
Parents: 5738dd4
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Tue Mar 29 15:16:35 2016 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Tue Mar 29 15:16:35 2016 -0700

----------------------------------------------------------------------
 .../YARN/2.1.0.2.0/package/scripts/params_linux.py      |  3 ---
 .../YARN/2.1.0.2.0/package/scripts/service_check.py     | 12 +-----------
 2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e23ed7bf/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 1a060de..719f42c 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
@@ -195,9 +195,6 @@ yarn_log_dir = format("{yarn_log_dir_prefix}/{yarn_user}")
 mapred_job_summary_log = format("{mapred_log_dir_prefix}/{mapred_user}/hadoop-mapreduce.jobsummary.log")
 yarn_job_summary_log = format("{yarn_log_dir_prefix}/{yarn_user}/hadoop-mapreduce.jobsummary.log")
 
-yarn_default_queue_name = "default"
-yarn_scheduler_capacity_root_queues = default("/configurations/capacity-scheduler/yarn.scheduler.capacity.root.queues",
yarn_default_queue_name)
-
 user_group = config['configurations']['cluster-env']['user_group']
 
 #exclude file

http://git-wip-us.apache.org/repos/asf/ambari/blob/e23ed7bf/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
index 83bf460..93af5d2 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
@@ -29,7 +29,6 @@ from ambari_commons import os_utils
 from ambari_commons import OSConst
 from ambari_commons.os_family_impl import OsFamilyImpl
 from resource_management.libraries.functions.get_user_call_output import get_user_call_output
-from resource_management.core.logger import Logger
 
 CURL_CONNECTION_TIMEOUT = '5'
 
@@ -86,14 +85,6 @@ class ServiceCheckDefault(ServiceCheck):
     import params
     env.set_params(params)
 
-    queue_for_check = params.yarn_default_queue_name
-    yarn_queue_list = params.yarn_scheduler_capacity_root_queues.split(",")
-    yarn_queue_list = list(filter(lambda x: x.strip(), yarn_queue_list))
-
-    if params.yarn_default_queue_name not in yarn_queue_list and len(yarn_queue_list) >
0:
-      queue_for_check = yarn_queue_list[0]
-      Logger.logger.info("No '{0}' queue present, using '{1}' instead".format(params.yarn_default_queue_name,
queue_for_check))
-
     if params.stack_version_formatted_major != "" and compare_versions(params.stack_version_formatted_major,
'2.2') >= 0:
       path_to_distributed_shell_jar = "/usr/hdp/current/hadoop-yarn-client/hadoop-yarn-applications-distributedshell.jar"
     else:
@@ -101,8 +92,7 @@ class ServiceCheckDefault(ServiceCheck):
 
     yarn_distrubuted_shell_check_params = ["yarn org.apache.hadoop.yarn.applications.distributedshell.Client",
                                            "-shell_command", "ls", "-num_containers", "{number_of_nm}",
-                                           "-jar", "{path_to_distributed_shell_jar}", "-timeout",
"300000",
-                                           "--queue", "{queue_for_check}"]
+                                           "-jar", "{path_to_distributed_shell_jar}", "-timeout",
"300000"]
     yarn_distrubuted_shell_check_cmd = format(" ".join(yarn_distrubuted_shell_check_params))
 
     if params.security_enabled:


Mime
View raw message