Repository: ambari Updated Branches: refs/heads/branch-2.5 212ee1cb0 -> d4244f520
AMBARI-21528. Zookeeper server has incorrect memory setting, missing m in Xmx value (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d4244f52 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d4244f52 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d4244f52 Branch: refs/heads/branch-2.5 Commit: d4244f5206feca1bb6001eea6d550494f69e8762 Parents: 212ee1c Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Wed Jul 19 16:01:42 2017 -0700 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Thu Jul 20 14:16:42 2017 -0700 ---------------------------------------------------------------------- .../ZOOKEEPER/3.4.5/package/scripts/params_linux.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d4244f52/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py index 0780d2e..b8e8f78 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py @@ -68,7 +68,10 @@ zk_log_dir = config['configurations']['zookeeper-env']['zk_log_dir'] zk_data_dir = config['configurations']['zoo.cfg']['dataDir'] zk_pid_dir = status_params.zk_pid_dir zk_pid_file = status_params.zk_pid_file -zk_server_heapsize_value = default('configurations/zookeeper-env/zk_server_heapsize', "1024m") +zk_server_heapsize_value = str(default('configurations/zookeeper-env/zk_server_heapsize', "1024")) +zk_server_heapsize_value = zk_server_heapsize_value.strip() +if len(zk_server_heapsize_value) > 0 and zk_server_heapsize_value[-1].isdigit(): + zk_server_heapsize_value = zk_server_heapsize_value + "m" zk_server_heapsize = format("-Xmx{zk_server_heapsize_value}") client_port = default('/configurations/zoo.cfg/clientPort', None)
