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/12 17:00:19 UTC
[1/2] ambari git commit: AMBARI-11435. Tell Ambari the value of
topology.max.replication.wait.time.sec for Storm HA. Tweak
topology.min.replication.count for HA case (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 84c1d89e6 -> dbfce6bdc
refs/heads/trunk e41e121e3 -> 569290d7b
AMBARI-11435. Tell Ambari the value of topology.max.replication.wait.time.sec for Storm HA. Tweak topology.min.replication.count for HA case (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/569290d7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/569290d7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/569290d7
Branch: refs/heads/trunk
Commit: 569290d7b0e6edaa3bd44e71260eb194d48d0b3e
Parents: e41e121
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Jun 12 17:59:04 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Jun 12 17:59:04 2015 +0300
----------------------------------------------------------------------
.../STORM/0.9.1.2.1/package/scripts/params_linux.py | 3 ++-
.../STORM/0.9.1.2.1/package/scripts/params_windows.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/569290d7/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 0df0100..d4bd359 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
@@ -28,6 +28,7 @@ from resource_management.libraries.functions.version import format_hdp_stack_ver
from resource_management.libraries.functions.default import default
from resource_management.libraries.script import Script
+
def get_bare_principal(normalized_principal_name):
"""
Given a normalized principal name (nimbus/c6501.ambari.apache.org@EXAMPLE.COM) returns just the
@@ -98,7 +99,7 @@ default_topology_min_replication_count = default('/configurations/storm-site/top
if len(nimbus_hosts) > 1:
# for HA Nimbus
actual_topology_max_replication_wait_time_sec = -1
- actual_topology_min_replication_count = 2
+ actual_topology_min_replication_count = len(nimbus_hosts) / 2 + 1
else:
# for non-HA Nimbus
actual_topology_max_replication_wait_time_sec = default_topology_max_replication_wait_time_sec
http://git-wip-us.apache.org/repos/asf/ambari/blob/569290d7/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py
index 4853762..3408bfb 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py
@@ -41,7 +41,7 @@ default_topology_min_replication_count = default('/configurations/storm-site/top
if len(nimbus_hosts) > 1:
# for HA Nimbus
actual_topology_max_replication_wait_time_sec = -1
- actual_topology_min_replication_count = 2
+ actual_topology_min_replication_count = len(nimbus_hosts) / 2 + 1
else:
# for non-HA Nimbus
actual_topology_max_replication_wait_time_sec = default_topology_max_replication_wait_time_sec
[2/2] ambari git commit: AMBARI-11435. Tell Ambari the value of
topology.max.replication.wait.time.sec for Storm HA. Tweak
topology.min.replication.count for HA case (dlysnichenko)
Posted by dm...@apache.org.
AMBARI-11435. Tell Ambari the value of topology.max.replication.wait.time.sec for Storm HA. Tweak topology.min.replication.count for HA case (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dbfce6bd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dbfce6bd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dbfce6bd
Branch: refs/heads/branch-2.1
Commit: dbfce6bdc93c2f463bc2d1150703722bd883782e
Parents: 84c1d89
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Jun 12 17:59:04 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Jun 12 18:00:01 2015 +0300
----------------------------------------------------------------------
.../STORM/0.9.1.2.1/package/scripts/params_linux.py | 3 ++-
.../STORM/0.9.1.2.1/package/scripts/params_windows.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dbfce6bd/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 0df0100..d4bd359 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
@@ -28,6 +28,7 @@ from resource_management.libraries.functions.version import format_hdp_stack_ver
from resource_management.libraries.functions.default import default
from resource_management.libraries.script import Script
+
def get_bare_principal(normalized_principal_name):
"""
Given a normalized principal name (nimbus/c6501.ambari.apache.org@EXAMPLE.COM) returns just the
@@ -98,7 +99,7 @@ default_topology_min_replication_count = default('/configurations/storm-site/top
if len(nimbus_hosts) > 1:
# for HA Nimbus
actual_topology_max_replication_wait_time_sec = -1
- actual_topology_min_replication_count = 2
+ actual_topology_min_replication_count = len(nimbus_hosts) / 2 + 1
else:
# for non-HA Nimbus
actual_topology_max_replication_wait_time_sec = default_topology_max_replication_wait_time_sec
http://git-wip-us.apache.org/repos/asf/ambari/blob/dbfce6bd/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py
index 4853762..3408bfb 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_windows.py
@@ -41,7 +41,7 @@ default_topology_min_replication_count = default('/configurations/storm-site/top
if len(nimbus_hosts) > 1:
# for HA Nimbus
actual_topology_max_replication_wait_time_sec = -1
- actual_topology_min_replication_count = 2
+ actual_topology_min_replication_count = len(nimbus_hosts) / 2 + 1
else:
# for non-HA Nimbus
actual_topology_max_replication_wait_time_sec = default_topology_max_replication_wait_time_sec