AMBARI-16834. Any start command fails if AMS is installed. (aonischuk via avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2845140b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2845140b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2845140b Branch: refs/heads/branch-2.5 Commit: 2845140b070da184f91e375c9da0955a546a58f9 Parents: 0e75b99 Author: Aravindan Vijayan <[email protected]> Authored: Mon Nov 14 21:21:56 2016 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Tue Nov 15 11:06:39 2016 -0800 ---------------------------------------------------------------------- .../test/python/ambari_agent/TestRecoveryManager.py | 7 +++---- .../FLUME/1.4.0.2.0/package/scripts/params.py | 2 +- .../STORM/0.9.1/package/scripts/params_linux.py | 4 ++-- .../HDP/2.0.6/hooks/before-START/scripts/params.py | 2 +- .../templates/hadoop-metrics2.properties.j2 | 14 +++++++------- 5 files changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2845140b/ambari-agent/src/test/python/ambari_agent/TestRecoveryManager.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/test/python/ambari_agent/TestRecoveryManager.py b/ambari-agent/src/test/python/ambari_agent/TestRecoveryManager.py index 776fbef..1bbaa12 100644 --- a/ambari-agent/src/test/python/ambari_agent/TestRecoveryManager.py +++ b/ambari-agent/src/test/python/ambari_agent/TestRecoveryManager.py @@ -467,19 +467,18 @@ class _TestRecoveryManager(TestCase): def _test_update_rm_config(self, mock_uc): rm = RecoveryManager(tempfile.mktemp()) rm.update_configuration_from_registration(None) - mock_uc.assert_has_calls([call(6, 60, 5, 12, False, False, False, "", -1)]) + mock_uc.assert_has_calls([call(6, 60, 5, 12, False, False, "", -1)]) mock_uc.reset_mock() rm.update_configuration_from_registration({}) - mock_uc.assert_has_calls([call(6, 60, 5, 12, False, False, False, "", -1)]) + mock_uc.assert_has_calls([call(6, 60, 5, 12, False, False, "", -1)]) mock_uc.reset_mock() rm.update_configuration_from_registration( {"recoveryConfig": { "type" : "DEFAULT"}} ) - - mock_uc.assert_has_calls([call(6, 60, 5, 12, False, False, False, "", -1)]) + mock_uc.assert_has_calls([call(6, 60, 5, 12, False, False, "", -1)]) mock_uc.reset_mock() rm.update_configuration_from_registration( http://git-wip-us.apache.org/repos/asf/ambari/blob/2845140b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py index fe29165..9c79909 100644 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py @@ -115,7 +115,7 @@ metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sin metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10) #Collector hosts -metric_collector_hosts = None +metric_collector_hosts = "" if ams_collector_hosts: for host in ams_collector_hosts: metric_collector_hosts += host + ':' + metric_collector_port + ',' http://git-wip-us.apache.org/repos/asf/ambari/blob/2845140b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py index 4d73195..697015f 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py @@ -204,14 +204,14 @@ metric_collector_sink_jar = "/usr/lib/storm/lib/ambari-metrics-storm-sink-with-c metric_collector_legacy_sink_jar = "/usr/lib/storm/lib/ambari-metrics-storm-sink-legacy-with-common-*.jar" # Collector hosts -metric_collector_hosts = None +metric_collector_hosts = "" if ams_collector_hosts: for host in ams_collector_hosts: metric_collector_hosts += host + ':' + metric_collector_port + ',' metric_collector_hosts = metric_collector_hosts[:-1] # Cluster Zookeeper quorum -zookeeper_quorum = None +zookeeper_quorum = "" if storm_zookeeper_servers: for server in storm_zookeeper_servers: zookeeper_quorum += server + ':' + storm_zookeeper_port + "," http://git-wip-us.apache.org/repos/asf/ambari/blob/2845140b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py index fdc9c17..c678a72 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py @@ -137,7 +137,7 @@ metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sin metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10) #Collector hosts -metric_collector_hosts = None +metric_collector_hosts = "" if ams_collector_hosts: for host in ams_collector_hosts: metric_collector_hosts += host + ':' + metric_collector_port + ',' http://git-wip-us.apache.org/repos/asf/ambari/blob/2845140b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 index 075d2c9..28102d2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 @@ -81,13 +81,13 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue *.sink.timeline.truststore.type = {{metric_truststore_type}} *.sink.timeline.truststore.password = {{metric_truststore_password}} -datanode.sink.timeline.collector={{metrics_collector_hosts}} -namenode.sink.timeline.collector={{metrics_collector_hosts}} -resourcemanager.sink.timeline.collector={{metrics_collector_hosts}} -nodemanager.sink.timeline.collector={{metrics_collector_hosts}} -jobhistoryserver.sink.timeline.collector={{metrics_collector_hosts}} -journalnode.sink.timeline.collector={{metrics_collector_hosts}} -applicationhistoryserver.sink.timeline.collector={{metrics_collector_hosts}} +datanode.sink.timeline.collector={{metric_collector_hosts}} +namenode.sink.timeline.collector={{metric_collector_hosts}} +resourcemanager.sink.timeline.collector={{metric_collector_hosts}} +nodemanager.sink.timeline.collector={{metric_collector_hosts}} +jobhistoryserver.sink.timeline.collector={{metric_collector_hosts}} +journalnode.sink.timeline.collector={{metric_collector_hosts}} +applicationhistoryserver.sink.timeline.collector={{metric_collector_hosts}} resourcemanager.sink.timeline.tagsForPrefix.yarn=Queue
