Repository: ambari Updated Branches: refs/heads/branch-2.5 43d30212f -> 280bb6ecf
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/9dae770a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9dae770a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9dae770a Branch: refs/heads/branch-2.5 Commit: 9dae770a4b90dbc6116a0298ed322880ab732173 Parents: 43d3021 Author: Aravindan Vijayan <[email protected]> Authored: Wed Nov 16 12:25:51 2016 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Wed Nov 16 12:51:30 2016 -0800 ---------------------------------------------------------------------- .../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/9dae770a/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 ff590ee..e753e98 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 @@ -202,9 +203,9 @@ metric_collector_legacy_sink_jar = "/usr/lib/storm/lib/ambari-metrics-storm-sink # 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 = ''
