Repository: ambari Updated Branches: refs/heads/trunk e79d388a8 -> 0079796ad
AMBARI-17291 zookeeper.quorum in storm-metrics2.properties is broken (Masahiro Tanaka via avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0079796a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0079796a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0079796a Branch: refs/heads/trunk Commit: 0079796ad541824db1cf9c72461da3e651cdd788 Parents: e79d388 Author: Aravindan Vijayan <[email protected]> Authored: Wed Jul 20 11:40:22 2016 -0700 Committer: Aravindan Vijayan <[email protected]> Committed: Wed Jul 20 11:40:29 2016 -0700 ---------------------------------------------------------------------- .../STORM/0.9.1/package/scripts/params_linux.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0079796a/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 4468280..870dc38 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 @@ -24,6 +24,7 @@ import ambari_simplejson as json # simplejson is much faster comparing to Python import status_params from ambari_commons.constants import AMBARI_SUDO_BINARY +from ambari_commons import yaml_utils from resource_management.libraries.functions import format from resource_management.libraries.functions.default import default from resource_management.libraries.functions.get_bare_principal import get_bare_principal @@ -208,9 +209,9 @@ if ams_collector_hosts: # Cluster Zookeeper quorum zookeeper_quorum = "" if storm_zookeeper_servers: - for server in storm_zookeeper_servers: - zookeeper_quorum += server + ':' + storm_zookeeper_port + "," - zookeeper_quorum = zookeeper_quorum[:-1] + storm_zookeeper_servers_list = yaml_utils.get_values_from_yaml_array(storm_zookeeper_servers) + zookeeper_quorum = (":" + storm_zookeeper_port + ",").join(storm_zookeeper_servers_list) + zookeeper_quorum += ":" + storm_zookeeper_port jar_jvm_opts = ''
