You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/06/02 16:58:37 UTC
ambari git commit: AMBARI-11611. Delete incorrect Storm-HA configs.
Fix unit tests (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 9e75a7370 -> 7f3945548
AMBARI-11611. Delete incorrect Storm-HA configs. Fix unit tests (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7f394554
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7f394554
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7f394554
Branch: refs/heads/trunk
Commit: 7f3945548e419099a17a72d86a4ff6a236f5519d
Parents: 9e75a73
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Jun 2 17:51:23 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Jun 2 17:58:16 2015 +0300
----------------------------------------------------------------------
.../STORM/0.9.1.2.1/package/scripts/params_linux.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7f394554/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
index 6c3078b..4e49e2f 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
@@ -104,8 +104,11 @@ else:
actual_topology_max_replication_wait_time_sec = default_topology_max_replication_wait_time_sec
actual_topology_min_replication_count = default_topology_min_replication_count
-del config['configurations']['storm-site']['topology.max.replication.wait.time.sec.default']
-del config['configurations']['storm-site']['topology.min.replication.count.default']
+if default_topology_max_replication_wait_time_sec:
+ del config['configurations']['storm-site']['topology.max.replication.wait.time.sec.default']
+if default_topology_min_replication_count:
+ del config['configurations']['storm-site']['topology.min.replication.count.default']
+
rest_api_port = "8745"
rest_api_admin_port = "8746"
rest_api_conf_file = format("{conf_dir}/config.yaml")