You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/06/02 18:41:26 UTC
ambari git commit: AMBARI-11607: STORM service does not start
(jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 62898b3d4 -> 82e2ac39e
AMBARI-11607: STORM service does not start (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/82e2ac39
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/82e2ac39
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/82e2ac39
Branch: refs/heads/trunk
Commit: 82e2ac39e5f3c1fe242ab2a637f122e0badd9d8b
Parents: 62898b3
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Tue Jun 2 09:41:21 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Tue Jun 2 09:41:21 2015 -0700
----------------------------------------------------------------------
.../FALCON/0.5.0.2.1/package/scripts/params_windows.py | 3 ++-
.../KNOX/0.5.0.2.2/package/scripts/knox.py | 2 +-
.../STORM/0.9.1.2.1/package/scripts/params_windows.py | 13 +++++++++++++
3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/82e2ac39/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py
index a5e23f2..9136957 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py
@@ -34,7 +34,8 @@ falcon_data_dir = "."
falcon_home = None
falcon_log_dir = "."
-hdp_root = os.path.abspath(os.path.join(os.environ["HADOOP_HOME"], ".."))
+if os.environ.has_key("HADOOP_HOME"):
+ hdp_root = os.path.abspath(os.path.join(os.environ["HADOOP_HOME"], ".."))
if os.environ.has_key("FALCON_CONF_DIR"):
falcon_conf_dir = os.environ["FALCON_CONF_DIR"]
http://git-wip-us.apache.org/repos/asf/ambari/blob/82e2ac39/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py
index 302e49c..055b76e 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py
@@ -18,7 +18,7 @@ limitations under the License.
"""
import os
-
+from resource_management.libraries.script.script import Script
from resource_management.libraries.resources.xml_config import XmlConfig
from resource_management.core.resources.service import ServiceConfig
from resource_management.libraries.functions.format import format
http://git-wip-us.apache.org/repos/asf/ambari/blob/82e2ac39/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 2c7f041..688b1d9 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
@@ -32,6 +32,19 @@ hadoop_user = config["configurations"]["cluster-env"]["hadoop.user.name"]
storm_user = hadoop_user
security_enabled = config['configurations']['cluster-env']['security_enabled']
+default_topology_max_replication_wait_time_sec = default('/configurations/storm-site/topology.max.replication.wait.time.sec.default', None)
+actual_topology_max_replication_wait_time_sec = default('/configurations/storm-site/topology.max.replication.wait.time.sec', None)
+nimbus_hosts = default("/clusterHostInfo/nimbus_hosts", [])
+actual_topology_min_replication_count = default('/configurations/storm-site/topology.min.replication.count', None)
+default_topology_min_replication_count = default('/configurations/storm-site/topology.min.replication.count.default', None)
+
+#Calculate topology.max.replication.wait.time.sec and topology.min.replication.count
+if len(nimbus_hosts) > 1:
+ actual_topology_max_replication_wait_time_sec = -1
+ actual_topology_min_replication_count = 2
+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
if stack_is_hdp23_or_further:
if security_enabled: