Repository: ambari Updated Branches: refs/heads/branch-2.1 6ea0b83c8 -> 23d7b1742 refs/heads/trunk cebb515d4 -> 601af4efb
AMBARI-12334. YARN service check issues (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/601af4ef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/601af4ef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/601af4ef Branch: refs/heads/trunk Commit: 601af4efb5d8053bcb2d972ce5930ab8be6f3665 Parents: cebb515 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Wed Jul 8 17:53:55 2015 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Wed Jul 8 17:53:55 2015 +0300 ---------------------------------------------------------------------- .../YARN/2.1.0.2.0/package/scripts/params_linux.py | 3 ++- .../YARN/2.1.0.2.0/package/scripts/service_check.py | 2 +- .../src/test/python/stacks/2.0.6/configs/client-upgrade.json | 3 ++- 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 ++- 5 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/601af4ef/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 0b1bec5..77092c1 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 @@ -121,7 +121,7 @@ kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executab rm_hosts = config['clusterHostInfo']['rm_host'] rm_host = rm_hosts[0] rm_port = config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'].split(':')[-1] -rm_https_port = "8090" +rm_https_port = config['configurations']['yarn-site']['yarn.resourcemanager.webapp.https.address'].split(':')[-1] # TODO UPGRADE default, update site during upgrade rm_nodes_exclude_path = default("/configurations/yarn-site/yarn.resourcemanager.nodes.exclude-path","/etc/hadoop/conf/yarn.exclude") @@ -285,6 +285,7 @@ yarn_http_policy = config['configurations']['yarn-site']['yarn.http.policy'] yarn_https_on = (yarn_http_policy.upper() == 'HTTPS_ONLY') scheme = 'http' if not yarn_https_on else 'https' yarn_rm_address = config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'] if not yarn_https_on else config['configurations']['yarn-site']['yarn.resourcemanager.webapp.https.address'] +rm_active_port = rm_https_port if yarn_https_on else rm_port #ranger yarn properties if has_ranger_admin: http://git-wip-us.apache.org/repos/asf/ambari/blob/601af4ef/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 a58db1d..1d593ba 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 @@ -114,7 +114,7 @@ class ServiceCheckDefault(ServiceCheck): json_response_received = False for rm_host in params.rm_hosts: - info_app_url = params.scheme + "://" + params.yarn_rm_address + "/ws/v1/cluster/apps/" + application_name + info_app_url = params.scheme + "://" + rm_host + ":" + params.rm_active_port + "/ws/v1/cluster/apps/" + application_name get_app_info_cmd = "curl --negotiate -u : -ksL --connect-timeout " + CURL_CONNECTION_TIMEOUT + " " + info_app_url http://git-wip-us.apache.org/repos/asf/ambari/blob/601af4ef/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json index a8bc490..c13e5c9 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json @@ -484,7 +484,8 @@ "yarn.timeline-service.webapp.https.address": "c6402.ambari.apache.org:8190", "yarn.resourcemanager.connect.retry-interval.ms": "30000", "yarn.timeline-service.leveldb-timeline-store.start-time-write-cache-size": "10000", - "yarn.http.policy": "HTTP_ONLY" + "yarn.http.policy": "HTTP_ONLY", + "yarn.resourcemanager.webapp.https.address": "c6402.ambari.apache.org:8090" }, "capacity-scheduler": { "yarn.scheduler.capacity.default.minimum-user-limit-percent": "100", http://git-wip-us.apache.org/repos/asf/ambari/blob/601af4ef/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 e8163ee..12cc74d 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 @@ -474,7 +474,8 @@ "yarn.resourcemanager.admin.address": "c6402.ambari.apache.org:8141", "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler", "yarn.timeline-service.leveldb-timeline-store.path": "/var/log/hadoop-yarn/timeline", - "yarn.http.policy": "HTTP_ONLY" + "yarn.http.policy": "HTTP_ONLY", + "yarn.resourcemanager.webapp.https.address": "c6402.ambari.apache.org:8090" }, "tez-site": { "tez.am.log.level": "WARN", http://git-wip-us.apache.org/repos/asf/ambari/blob/601af4ef/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 88cbe5f..5da1679 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 @@ -529,7 +529,8 @@ "yarn.timeline-service.leveldb-timeline-store.path": "/var/log/hadoop-yarn/timeline", "yarn.timeline-service.principal": "yarn/_h...@example.com", "yarn.timeline-service.keytab" : "/etc/security/keytabs/yarn.service.keytab", - "yarn.http.policy": "HTTP_ONLY" + "yarn.http.policy": "HTTP_ONLY", + "yarn.resourcemanager.webapp.https.address": "c6402.ambari.apache.org:8090" }, "yarn-env": { "yarn_pid_dir_prefix": "/var/run/hadoop-yarn",
