You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/04/21 16:14:47 UTC
[2/2] ambari git commit: AMBARI-16014. ambari-agent.log gets flooded
up with exceptions from status commands (aonishuk)
AMBARI-16014. ambari-agent.log gets flooded up with exceptions from status commands (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9be2ba28
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9be2ba28
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9be2ba28
Branch: refs/heads/trunk
Commit: 9be2ba28880dd7a87d3bd246d9566f0f745ce6c2
Parents: 4a6dadc
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Apr 21 17:14:39 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Apr 21 17:14:39 2016 +0300
----------------------------------------------------------------------
.../1.6.1.2.2.0/package/scripts/accumulo_client.py | 4 ++--
.../1.6.1.2.2.0/package/scripts/accumulo_script.py | 4 ++--
.../ACCUMULO/1.6.1.2.2.0/package/scripts/params.py | 3 ++-
.../ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py | 3 +++
.../ATLAS/0.1.0.2.3/package/scripts/atlas_client.py | 4 ++--
.../ATLAS/0.1.0.2.3/package/scripts/metadata_server.py | 4 ++--
.../ATLAS/0.1.0.2.3/package/scripts/params.py | 2 +-
.../ATLAS/0.1.0.2.3/package/scripts/status_params.py | 2 ++
.../FALCON/0.5.0.2.1/package/scripts/falcon_client.py | 4 ++--
.../FALCON/0.5.0.2.1/package/scripts/falcon_server.py | 4 ++--
.../FALCON/0.5.0.2.1/package/scripts/params_linux.py | 2 +-
.../FALCON/0.5.0.2.1/package/scripts/status_params.py | 2 ++
.../FLUME/1.4.0.2.0/package/scripts/flume_handler.py | 4 ++--
.../HBASE/0.96.0.2.0/package/scripts/hbase_client.py | 4 ++--
.../HBASE/0.96.0.2.0/package/scripts/hbase_master.py | 4 ++--
.../0.96.0.2.0/package/scripts/hbase_regionserver.py | 4 ++--
.../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 2 +-
.../0.96.0.2.0/package/scripts/phoenix_queryserver.py | 4 ++--
.../HBASE/0.96.0.2.0/package/scripts/status_params.py | 4 +++-
.../HDFS/2.1.0.2.0/package/scripts/datanode.py | 10 +++++-----
.../HDFS/2.1.0.2.0/package/scripts/hdfs_client.py | 4 ++--
.../HDFS/2.1.0.2.0/package/scripts/journalnode.py | 4 ++--
.../HDFS/2.1.0.2.0/package/scripts/namenode.py | 4 ++--
.../HDFS/2.1.0.2.0/package/scripts/nfsgateway.py | 4 ++--
.../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 2 +-
.../HDFS/2.1.0.2.0/package/scripts/snamenode.py | 4 ++--
.../HDFS/2.1.0.2.0/package/scripts/status_params.py | 2 ++
.../HIVE/0.12.0.2.0/package/scripts/hcat_client.py | 4 ++--
.../HIVE/0.12.0.2.0/package/scripts/hive_client.py | 4 ++--
.../HIVE/0.12.0.2.0/package/scripts/hive_metastore.py | 4 ++--
.../HIVE/0.12.0.2.0/package/scripts/hive_server.py | 4 ++--
.../0.12.0.2.0/package/scripts/hive_server_interactive.py | 4 ++--
.../HIVE/0.12.0.2.0/package/scripts/mysql_service.py | 5 ++++-
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 2 +-
.../HIVE/0.12.0.2.0/package/scripts/status_params.py | 4 +++-
.../HIVE/0.12.0.2.0/package/scripts/webhcat_server.py | 4 ++--
.../KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py | 4 ++--
.../KNOX/0.5.0.2.2/package/scripts/knox_gateway.py | 4 ++--
.../KNOX/0.5.0.2.2/package/scripts/params_linux.py | 4 +++-
.../KNOX/0.5.0.2.2/package/scripts/status_params.py | 4 +++-
.../MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py | 4 ++--
.../OOZIE/4.0.0.2.0/package/scripts/oozie_client.py | 4 ++--
.../OOZIE/4.0.0.2.0/package/scripts/oozie_server.py | 4 ++--
.../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 2 +-
.../OOZIE/4.0.0.2.0/package/scripts/status_params.py | 2 ++
.../PIG/0.12.0.2.0/package/scripts/pig_client.py | 4 ++--
.../RANGER/0.4.0/package/scripts/params.py | 1 +
.../RANGER/0.4.0/package/scripts/ranger_admin.py | 4 ++--
.../RANGER/0.4.0/package/scripts/ranger_tagsync.py | 4 ++--
.../RANGER/0.4.0/package/scripts/ranger_usersync.py | 4 ++--
.../RANGER/0.4.0/package/scripts/status_params.py | 4 +++-
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py | 4 ++--
.../SLIDER/0.60.0.2.2/package/scripts/slider_client.py | 4 ++--
.../SPARK/1.2.0.2.2/package/scripts/job_history_server.py | 4 ++--
.../SPARK/1.2.0.2.2/package/scripts/params.py | 2 +-
.../SPARK/1.2.0.2.2/package/scripts/spark_client.py | 4 ++--
.../1.2.0.2.2/package/scripts/spark_thrift_server.py | 4 ++--
.../SPARK/1.2.0.2.2/package/scripts/status_params.py | 2 ++
.../SQOOP/1.4.4.2.0/package/scripts/service_check.py | 4 ++--
.../STORM/0.9.1.2.1/package/scripts/drpc_server.py | 4 ++--
.../STORM/0.9.1.2.1/package/scripts/nimbus.py | 4 ++--
.../STORM/0.9.1.2.1/package/scripts/nimbus_prod.py | 4 ++--
.../STORM/0.9.1.2.1/package/scripts/params_linux.py | 2 +-
.../STORM/0.9.1.2.1/package/scripts/rest_api.py | 4 ++--
.../STORM/0.9.1.2.1/package/scripts/status_params.py | 2 ++
.../STORM/0.9.1.2.1/package/scripts/supervisor.py | 4 ++--
.../STORM/0.9.1.2.1/package/scripts/supervisor_prod.py | 4 ++--
.../STORM/0.9.1.2.1/package/scripts/ui_server.py | 4 ++--
.../TEZ/0.4.0.2.1/package/scripts/tez_client.py | 4 ++--
.../package/scripts/application_timeline_server.py | 4 ++--
.../YARN/2.1.0.2.0/package/scripts/historyserver.py | 4 ++--
.../YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py | 4 ++--
.../YARN/2.1.0.2.0/package/scripts/nodemanager.py | 4 ++--
.../YARN/2.1.0.2.0/package/scripts/params_linux.py | 2 +-
.../YARN/2.1.0.2.0/package/scripts/resourcemanager.py | 4 ++--
.../YARN/2.1.0.2.0/package/scripts/status_params.py | 2 ++
.../YARN/2.1.0.2.0/package/scripts/yarn_client.py | 4 ++--
.../ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py | 2 +-
.../ZOOKEEPER/3.4.5.2.0/package/scripts/status_params.py | 1 +
.../3.4.5.2.0/package/scripts/zookeeper_client.py | 4 ++--
.../3.4.5.2.0/package/scripts/zookeeper_server.py | 4 ++--
.../stacks/2.2/configs/ranger-usersync-upgrade.json | 1 +
82 files changed, 162 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_client.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_client.py
index ebfacf2..8f94a59 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_client.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_client.py
@@ -31,8 +31,8 @@ from accumulo_configuration import setup_conf_dir
class AccumuloClient(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "accumulo-client"}
+ import status_params
+ return {status_params.stack_name: "accumulo-client"}
def install(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
index 1004d23..e210a11 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
@@ -57,12 +57,12 @@ class AccumuloScript(Script):
:return: the name of the component on the stack which is used by
<stack-selector-tool>
"""
- import params
+ import status_params
if self.component not in self.COMPONENT_TO_STACK_SELECT_MAPPING:
return None
stack_component = self.COMPONENT_TO_STACK_SELECT_MAPPING[self.component]
- return {params.stack_name: stack_component}
+ return {status_params.stack_name: stack_component}
def install(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
index 03debcc..7352f33 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
@@ -40,7 +40,8 @@ exec_tmp_dir = status_params.tmp_dir
security_enabled = status_params.security_enabled
# stack name
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
+
# stack version
version = default("/commandParams/version", None)
stack_version_unformatted = config['hostLevelParams']['stack_version']
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py
index 0b2ca6f..9fc89f1 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py
@@ -48,3 +48,6 @@ hostname = config['hostname']
security_enabled = config['configurations']['cluster-env']['security_enabled']
kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
tmp_dir = Script.get_tmp_dir()
+
+# stack name
+stack_name = default("/hostLevelParams/stack_name", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py
index 14a12d3..3715e61 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py
@@ -31,8 +31,8 @@ from metadata import metadata
class AtlasClient(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "atlas-client"}
+ import status_params
+ return {status_params.stack_name: "atlas-client"}
# ToDo: currently <stack-selector-tool> doesn't contain atlas-client, uncomment this block when
# ToDo: atlas-client will be available
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
index 8103ec7..ae760cb 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
@@ -31,8 +31,8 @@ from resource_management.libraries.functions import StackFeature
class MetadataServer(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "atlas-server"}
+ import status_params
+ return {status_params.stack_name: "atlas-server"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index 24f9519..04f6bf2 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -40,7 +40,7 @@ if security_enabled:
atlas_jaas_principal = _atlas_principal_name.replace('_HOST',_hostname_lowercase)
atlas_keytab_path = config['configurations']['application-properties']['atlas.authentication.keytab']
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
# New Cluster Stack Version that is defined during the RESTART of a Stack Upgrade
version = default("/commandParams/version", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
index b6b027e..4c54214 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
@@ -36,3 +36,5 @@ hostname = config['hostname']
security_enabled = config['configurations']['cluster-env']['security_enabled']
kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
tmp_dir = Script.get_tmp_dir()
+
+stack_name = default("/hostLevelParams/stack_name", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
index 75b5de4..fa869be 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
@@ -38,8 +38,8 @@ class FalconClient(Script):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class FalconClientLinux(FalconClient):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "falcon-client"}
+ import status_params
+ return {status_params.stack_name: "falcon-client"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py
index 86bf3b6..d4935fe 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py
@@ -60,8 +60,8 @@ class FalconServer(Script):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class FalconServerLinux(FalconServer):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "falcon-server"}
+ import status_params
+ return {status_params.stack_name: "falcon-server"}
def install(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
index 77e18ff..bf7f437 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
@@ -32,7 +32,7 @@ from resource_management.libraries.functions import StackFeature
config = Script.get_config()
stack_root = status_params.stack_root
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
agent_stack_retry_on_unavailability = config['hostLevelParams']['agent_stack_retry_on_unavailability']
agent_stack_retry_count = expect("/hostLevelParams/agent_stack_retry_count", int)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py
index 33f1c7e..0a0e370 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py
@@ -63,3 +63,5 @@ else:
tmp_dir = Script.get_tmp_dir()
hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
falcon_user = config['configurations']['falcon-env']['falcon_user']
+
+stack_name = default("/hostLevelParams/stack_name", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py
index 1bd99da..cf8d864 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py
@@ -27,6 +27,7 @@ from resource_management.libraries.functions import conf_select
from resource_management.libraries.functions import stack_select
from resource_management.libraries.functions.flume_agent_helper import find_expected_agent_names
from resource_management.libraries.functions.flume_agent_helper import get_flume_status
+from resource_management.libraries.functions.default import default
import service_mapping
from ambari_commons import OSConst
@@ -43,8 +44,7 @@ class FlumeHandler(Script):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class FlumeHandlerLinux(FlumeHandler):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "flume-server"}
+ return {default("/hostLevelParams/stack_name", None): "flume-server"}
def install(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
index b72e648..b56efa2 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
@@ -53,8 +53,8 @@ class HbaseClientWindows(HbaseClient):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class HbaseClientDefault(HbaseClient):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hbase-client"}
+ import status_params
+ return {status_params.stack_name: "hbase-client"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py
index 5833773..4b4a876 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py
@@ -71,8 +71,8 @@ class HbaseMasterWindows(HbaseMaster):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class HbaseMasterDefault(HbaseMaster):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hbase-master"}
+ import status_params
+ return {status_params.stack_name: "hbase-master"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
index 37dd0a1..4efa739 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
@@ -69,8 +69,8 @@ class HbaseRegionServerWindows(HbaseRegionServer):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class HbaseRegionServerDefault(HbaseRegionServer):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hbase-regionserver"}
+ import status_params
+ return {status_params.stack_name: "hbase-regionserver"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 621feb6..2c466ea 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -44,7 +44,7 @@ config = Script.get_config()
exec_tmp_dir = Script.get_tmp_dir()
sudo = AMBARI_SUDO_BINARY
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
agent_stack_retry_on_unavailability = config['hostLevelParams']['agent_stack_retry_on_unavailability']
agent_stack_retry_count = expect("/hostLevelParams/agent_stack_retry_count", int)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
index 7d639ec..93816e3 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
@@ -35,8 +35,8 @@ class PhoenixQueryServer(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "phoenix-server"}
+ import status_params
+ return {status_params.stack_name: "phoenix-server"}
def configure(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py
index 8b60292..70b5548 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py
@@ -59,4 +59,6 @@ else:
hbase_conf_dir = "/etc/hbase/conf"
limits_conf_dir = "/etc/security/limits.d"
if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted):
- hbase_conf_dir = format("{stack_root}/current/{component_directory}/conf")
\ No newline at end of file
+ hbase_conf_dir = format("{stack_root}/current/{component_directory}/conf")
+
+stack_name = default("/hostLevelParams/stack_name", None)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py
index ffaf4ea..1e0c605 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py
@@ -33,17 +33,17 @@ from utils import get_hdfs_binary
class DataNode(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "hadoop-hdfs-datanode"}
+ import status_params
+ return {status_params.stack_name : "hadoop-hdfs-datanode"}
def get_hdfs_binary(self):
"""
Get the name or path to the hdfs binary depending on the stack and version.
"""
- import params
+ import status_params
stack_to_comp = self.get_stack_to_component()
- if params.stack_name in stack_to_comp:
- return get_hdfs_binary(stack_to_comp[params.stack_name])
+ if status_params.stack_name in stack_to_comp:
+ return get_hdfs_binary(stack_to_comp[status_params.stack_name])
return "hdfs"
def install(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py
index 9f62d29..e3b0070 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py
@@ -57,8 +57,8 @@ class HdfsClient(Script):
class HdfsClientDefault(HdfsClient):
def get_stack_to_component(self):
- import params
- return { params.stack_name : "hadoop-client"}
+ import status_params
+ return { status_params.stack_name : "hadoop-client"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py
index ac73eaf..9929b02 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py
@@ -43,8 +43,8 @@ class JournalNode(Script):
class JournalNodeDefault(JournalNode):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "hadoop-hdfs-journalnode"}
+ import status_params
+ return {status_params.stack_name : "hadoop-hdfs-journalnode"}
def pre_upgrade_restart(self, env, upgrade_type=None):
Logger.info("Executing Stack Upgrade pre-restart")
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
index c8acae3..bb6f1ca 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
@@ -69,8 +69,8 @@ except ImportError:
class NameNode(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "hadoop-hdfs-namenode"}
+ import status_params
+ return {status_params.stack_name : "hadoop-hdfs-namenode"}
def get_hdfs_binary(self):
"""
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/nfsgateway.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/nfsgateway.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/nfsgateway.py
index ca2e3ef..65cc4fb 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/nfsgateway.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/nfsgateway.py
@@ -33,8 +33,8 @@ from resource_management.libraries.functions.stack_features import check_stack_f
class NFSGateway(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "hadoop-hdfs-nfs3"}
+ import status_params
+ return {status_params.stack_name : "hadoop-hdfs-nfs3"}
def install(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index ce31108..d8ff3c5 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -48,7 +48,7 @@ from resource_management.libraries.functions.expect import expect
config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
stack_root = Script.get_stack_root()
upgrade_direction = default("/commandParams/upgrade_direction", None)
stack_version_unformatted = config['hostLevelParams']['stack_version']
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py
index 4a6f144..c8ec843 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py
@@ -65,8 +65,8 @@ class SNameNode(Script):
class SNameNodeDefault(SNameNode):
def get_stack_to_component(self):
- import params
- return { params.stack_name : "hadoop-hdfs-secondarynamenode"}
+ import status_params
+ return { status_params.stack_name : "hadoop-hdfs-secondarynamenode"}
def pre_upgrade_restart(self, env, upgrade_type=None):
Logger.info("Executing Stack Upgrade pre-restart")
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/status_params.py
index cdb683b..153f9a6 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/status_params.py
@@ -54,3 +54,5 @@ else:
kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
tmp_dir = Script.get_tmp_dir()
+
+stack_name = default("/hostLevelParams/stack_name", None)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py
index 6c41fc2..99c214d 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py
@@ -55,8 +55,8 @@ class HCatClientDefault(HCatClient):
# HCat client doesn't have a first-class entry in <stack-selector-tool>. Since clients always
# update after daemons, this ensures that the hcat directories are correct on hosts
# which do not include the WebHCat daemon
- import params
- return {params.stack_name: "hive-webhcat"}
+ import status_params
+ return {status_params.stack_name: "hive-webhcat"}
def pre_upgrade_restart(self, env, upgrade_type=None):
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py
index 6af0cd3..a87042a 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py
@@ -50,8 +50,8 @@ class HiveClientWindows(HiveClient):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class HiveClientDefault(HiveClient):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hadoop-client"}
+ import status_params
+ return {status_params.stack_name: "hadoop-client"}
def pre_upgrade_restart(self, env, upgrade_type=None):
Logger.info("Executing Hive client Stack Upgrade pre-restart")
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
index 319653e..ee82e79 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
@@ -84,8 +84,8 @@ class HiveMetastoreWindows(HiveMetastore):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class HiveMetastoreDefault(HiveMetastore):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hive-metastore"}
+ import status_params
+ return {status_params.stack_name: "hive-metastore"}
def status(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server.py
index 9ba8619..bea00ed 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server.py
@@ -77,8 +77,8 @@ class HiveServerWindows(HiveServer):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class HiveServerDefault(HiveServer):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hive-server2"}
+ import status_params
+ return {status_params.stack_name: "hive-server2"}
def start(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
index 8af82f0..430b41f 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
@@ -63,8 +63,8 @@ class HiveServerInteractive(Script):
class HiveServerInteractiveDefault(HiveServerInteractive):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hive-server2-hive2"}
+ import status_params
+ return {status_params.stack_name: "hive-server2-hive2"}
def install(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
index c48c1ef..bba5ce1 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
@@ -26,7 +26,10 @@ def mysql_service(daemon_name=None, action='start'):
cmd = ('service', daemon_name, action)
if action == 'status':
- Execute(status_cmd)
+ try:
+ Execute(status_cmd)
+ except Fail:
+ ComponentIsNotRunning()
elif action == 'stop':
import params
Execute(cmd,
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 122756a..a044fda 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -47,7 +47,7 @@ tmp_dir = Script.get_tmp_dir()
sudo = AMBARI_SUDO_BINARY
stack_root = status_params.stack_root
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
stack_name_uppercase = stack_name.upper()
agent_stack_retry_on_unavailability = config['hostLevelParams']['agent_stack_retry_on_unavailability']
agent_stack_retry_count = expect("/hostLevelParams/agent_stack_retry_count", int)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
index 75507a3..b148849 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
@@ -116,4 +116,6 @@ else:
hive_config_dir = hive_client_conf_dir
if 'role' in config and config['role'] in ["HIVE_SERVER", "HIVE_METASTORE", "HIVE_SERVER_INTERACTIVE"]:
- hive_config_dir = hive_server_conf_dir
\ No newline at end of file
+ hive_config_dir = hive_server_conf_dir
+
+stack_name = default("/hostLevelParams/stack_name", None)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py
index 482f0be..6924040 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py
@@ -65,8 +65,8 @@ class WebHCatServerWindows(WebHCatServer):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class WebHCatServerDefault(WebHCatServer):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hive-webhcat"}
+ import status_params
+ return {status_params.stack_name: "hive-webhcat"}
def status(self, env):
import status_params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
index 41074db..5f22bba 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
@@ -28,6 +28,7 @@ from resource_management.libraries.functions.check_process_status import check_p
from resource_management.libraries.functions import StackFeature
from resource_management.libraries.functions.stack_features import check_stack_feature
from resource_management.libraries.functions.show_logs import show_logs
+from resource_management.libraries.functions.default import default
from kafka import ensure_base_directories
import upgrade
@@ -37,8 +38,7 @@ from setup_ranger_kafka import setup_ranger_kafka
class KafkaBroker(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "kafka-broker"}
+ return {default("/hostLevelParams/stack_name", None) : "kafka-broker"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py
index aa5ce1f..0a37161 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py
@@ -52,8 +52,8 @@ from resource_management.libraries.functions import StackFeature
class KnoxGateway(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "knox-server"}
+ import status_params
+ return {status_params.stack_name: "knox-server"}
def install(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 95ab801..d572aff 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -18,6 +18,8 @@ limitations under the License.
Ambari Agent
"""
+import status_params
+
from resource_management.core.logger import Logger
import ambari_simplejson as json # simplejson is much faster comparing to Python 2.6 json module and has the same functions set.
@@ -41,7 +43,7 @@ config = Script.get_config()
stack_root = Script.get_stack_root()
tmp_dir = Script.get_tmp_dir()
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
upgrade_direction = default("/commandParams/upgrade_direction", None)
version = default("/commandParams/version", None)
# E.g., 2.3.2.0
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/status_params.py
index b4e8831..3cbd920 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/status_params.py
@@ -54,4 +54,6 @@ else:
hostname = config['hostname'].lower()
knox_user = default("/configurations/knox-env/knox_user", "knox")
kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
- temp_dir = Script.get_tmp_dir()
\ No newline at end of file
+ temp_dir = Script.get_tmp_dir()
+
+stack_name = default("/hostLevelParams/stack_name", None)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py
index d39b66a..1fa4625 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py
@@ -24,13 +24,13 @@ from resource_management.libraries.functions import stack_select
from resource_management.libraries.functions import conf_select
from resource_management.libraries.script import Script
from mahout import mahout
+from resource_management.libraries.functions.default import default
class MahoutClient(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "mahout-client"}
+ return {default("/hostLevelParams/stack_name", None): "mahout-client"}
def pre_upgrade_restart(self, env, upgrade_type=None):
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py
index dc08f0b..d7e9e4d 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py
@@ -32,8 +32,8 @@ from oozie_service import oozie_service
class OozieClient(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "oozie-client"}
+ import status_params
+ return {status_params.stack_name: "oozie-client"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py
index c7107c9..31cf9e9 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py
@@ -47,8 +47,8 @@ from check_oozie_server_status import check_oozie_server_status
class OozieServer(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "oozie-server"}
+ import status_params
+ return {status_params.stack_name: "oozie-server"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 77dbc81..75924c5 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -47,7 +47,7 @@ hostname = config["hostname"]
# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade
version = default("/commandParams/version", None)
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
stack_name_uppercase = stack_name.upper()
upgrade_direction = default("/commandParams/upgrade_direction", None)
agent_stack_retry_on_unavailability = config['hostLevelParams']['agent_stack_retry_on_unavailability']
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/status_params.py
index 5790c54..ce990cf 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/status_params.py
@@ -61,3 +61,5 @@ else:
tmp_dir = Script.get_tmp_dir()
oozie_user = config['configurations']['oozie-env']['oozie_user']
hostname = config["hostname"]
+
+stack_name = default("/hostLevelParams/stack_name", None)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py
index 81db437..90a5514 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py
@@ -29,6 +29,7 @@ from resource_management.libraries.functions.stack_features import check_stack_f
from pig import pig
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
+from resource_management.libraries.functions.default import default
class PigClient(Script):
def configure(self, env):
@@ -42,8 +43,7 @@ class PigClient(Script):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class PigClientLinux(PigClient):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hadoop-client"}
+ return {default("/hostLevelParams/stack_name", None): "hadoop-client"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
index 0a05173..175115d 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
@@ -17,6 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
+
import os
from resource_management.libraries.script import Script
from resource_management.libraries.functions.version import format_stack_version
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py
index 8e41c2c..66ae76e 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py
@@ -31,8 +31,8 @@ import os, errno
class RangerAdmin(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "ranger-admin"}
+ import status_params
+ return {status_params.stack_name: "ranger-admin"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py
index 79316f9..43ecd07 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py
@@ -73,8 +73,8 @@ class RangerTagsync(Script):
stack_select.select("ranger-tagsync", params.version)
def get_stack_to_component(self):
- import params
- return {params.stack_name: "ranger-tagsync"}
+ import status_params
+ return {status_params.stack_name: "ranger-tagsync"}
if __name__ == "__main__":
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py
index 675e798..2382d9c 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py
@@ -71,8 +71,8 @@ class RangerUsersync(Script):
upgrade.prestart(env, "ranger-usersync")
def get_stack_to_component(self):
- import params
- return {params.stack_name: "ranger-usersync"}
+ import status_params
+ return {status_params.stack_name: "ranger-usersync"}
if __name__ == "__main__":
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/status_params.py
index 251ca63..6cb69fb 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/status_params.py
@@ -20,10 +20,12 @@ limitations under the License.
from resource_management.libraries.script import Script
from resource_management.libraries.functions.format import format
+from resource_management.libraries.functions.default import default
config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
upgrade_marker_file = format("{tmp_dir}/rangeradmin_ru.inprogress")
ranger_pid_dir = config['configurations']['ranger-env']['ranger_pid_dir']
-tagsync_pid_file = format('{ranger_pid_dir}/tagsync.pid')
\ No newline at end of file
+tagsync_pid_file = format('{ranger_pid_dir}/tagsync.pid')
+stack_name = default("/hostLevelParams/stack_name", None)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py
index d8822c1..e13affc 100755
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py
@@ -24,6 +24,7 @@ from resource_management.core.exceptions import ComponentIsNotRunning
from resource_management.libraries.functions.format import format
from resource_management.core.logger import Logger
from resource_management.core import shell
+from resource_management.libraries.functions.default import default
from kms import kms, setup_kms_db, setup_java_patch, enable_kms_plugin, setup_kms_jce
from kms_service import kms_service
import upgrade
@@ -31,8 +32,7 @@ import upgrade
class KmsServer(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "ranger-kms"}
+ return {default("/hostLevelParams/stack_name", None): "ranger-kms"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py
index af08a51..ba76259 100644
--- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py
+++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py
@@ -23,6 +23,7 @@ from resource_management.libraries.functions import conf_select
from resource_management.libraries.functions import stack_select
from resource_management.libraries.functions import StackFeature
from resource_management.libraries.functions.stack_features import check_stack_feature
+from resource_management.libraries.functions.default import default
from slider import slider
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
@@ -34,8 +35,7 @@ class SliderClient(Script):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class SliderClientLinux(SliderClient):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "slider-client"}
+ return {default("/hostLevelParams/stack_name", None): "slider-client"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/job_history_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/job_history_server.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/job_history_server.py
index 1041a75..7a7f086 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/job_history_server.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/job_history_server.py
@@ -69,8 +69,8 @@ class JobHistoryServer(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "spark-historyserver"}
+ import status_params
+ return {status_params.stack_name : "spark-historyserver"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index a64f36f..c5f3eb6 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -49,7 +49,7 @@ component_directory = Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP,
config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
stack_root = Script.get_stack_root()
stack_version_unformatted = config['hostLevelParams']['stack_version']
stack_version_formatted = format_stack_version(stack_version_unformatted)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_client.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_client.py
index e2ec952..740c442 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_client.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_client.py
@@ -45,8 +45,8 @@ class SparkClient(Script):
raise ClientComponentHasNoStatus()
def get_stack_to_component(self):
- import params
- return {params.stack_name : "spark-client"}
+ import status_params
+ return {status_params.stack_name : "spark-client"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_thrift_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_thrift_server.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_thrift_server.py
index 3c32236..f3742be 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_thrift_server.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/spark_thrift_server.py
@@ -64,8 +64,8 @@ class SparkThriftServer(Script):
check_process_status(status_params.spark_thrift_server_pid_file)
def get_stack_to_component(self):
- import params
- return { params.stack_name : "spark-thriftserver"}
+ import status_params
+ return { status_params.stack_name : "spark-thriftserver"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py
index 19c9a0e..86e7f7d 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py
@@ -20,6 +20,7 @@ limitations under the License.
from resource_management.libraries.functions import format
from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.default import default
config = Script.get_config()
@@ -35,3 +36,4 @@ else:
spark_pid_dir = config['configurations']['spark-env']['spark_pid_dir']
spark_history_server_pid_file = format("{spark_pid_dir}/spark-{spark_user}-org.apache.spark.deploy.history.HistoryServer-1.pid")
spark_thrift_server_pid_file = format("{spark_pid_dir}/spark-{hive_user}-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2-1.pid")
+stack_name = default("/hostLevelParams/stack_name", None)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py
index f4f0302..30184d9 100644
--- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py
@@ -21,6 +21,7 @@ limitations under the License.
from resource_management.libraries.script.script import Script
from resource_management.core.resources import Execute
+from resource_management.libraries.functions.default import default
from resource_management.libraries.functions import format
from ambari_commons.os_family_impl import OsFamilyImpl
from ambari_commons import OSConst
@@ -33,8 +34,7 @@ class SqoopServiceCheck(Script):
class SqoopServiceCheckDefault(SqoopServiceCheck):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "sqoop-server"}
+ return {default("/hostLevelParams/stack_name", None): "sqoop-server"}
def service_check(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py
index 1f88898..acd7529 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py
@@ -37,8 +37,8 @@ from resource_management.libraries.functions.security_commons import build_expec
class DrpcServer(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "storm-client"}
+ import status_params
+ return {status_params.stack_name: "storm-client"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py
index b700349..296b78f 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py
@@ -39,8 +39,8 @@ from resource_management.core.resources.service import Service
class Nimbus(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "storm-nimbus"}
+ import status_params
+ return {status_params.stack_name : "storm-nimbus"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py
index 1956120..108b8c1 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py
@@ -32,8 +32,8 @@ from resource_management.libraries.functions import StackFeature
class Nimbus(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "storm-nimbus"}
+ import status_params
+ return {status_params.stack_name : "storm-nimbus"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/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 0752b30..3f9b936 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
@@ -47,7 +47,7 @@ sudo = AMBARI_SUDO_BINARY
cluster_name = config['clusterName']
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
upgrade_direction = default("/commandParams/upgrade_direction", Direction.UPGRADE)
version = default("/commandParams/version", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py
index e080794..db921cb 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py
@@ -39,8 +39,8 @@ class StormRestApi(Script):
"""
def get_stack_to_component(self):
- import params
- return {params.stack_name : "storm-client"}
+ import status_params
+ return {status_params.stack_name : "storm-client"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py
index 34a1b42..d84b095 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py
@@ -79,3 +79,5 @@ else:
storm_user = config['configurations']['storm-env']['storm_user']
storm_ui_principal = default('/configurations/storm-env/storm_ui_principal_name', None)
storm_ui_keytab = default('/configurations/storm-env/storm_ui_keytab', None)
+
+stack_name = default("/hostLevelParams/stack_name", None)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py
index bd9aade..c1a0f04 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py
@@ -36,8 +36,8 @@ from resource_management.core.resources.service import Service
class Supervisor(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "storm-supervisor"}
+ import status_params
+ return {status_params.stack_name : "storm-supervisor"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py
index aa79ee3..0577e4b 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py
@@ -34,8 +34,8 @@ from resource_management.libraries.functions import StackFeature
class Supervisor(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "storm-supervisor"}
+ import status_params
+ return {status_params.stack_name : "storm-supervisor"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py
index c7a62d9..b7fec9b 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py
@@ -43,8 +43,8 @@ from resource_management.core.resources.service import Service
class UiServer(Script):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "storm-client"}
+ import status_params
+ return {status_params.stack_name : "storm-client"}
def install(self, env):
self.install_packages(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py
index ca13c6e..9627de7 100644
--- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py
+++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py
@@ -34,6 +34,7 @@ from resource_management.libraries.functions import StackFeature
from resource_management.libraries.functions.stack_features import check_stack_feature
from resource_management.libraries.functions.get_stack_version import get_stack_version
from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.default import default
from tez import tez
@@ -50,8 +51,7 @@ class TezClient(Script):
class TezClientLinux(TezClient):
def get_stack_to_component(self):
- import params
- return {params.stack_name : "hadoop-client"}
+ return {default("/hostLevelParams/stack_name", None) : "hadoop-client"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py
index fdb5be5..3b4d134 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py
@@ -64,8 +64,8 @@ class ApplicationTimelineServerWindows(ApplicationTimelineServer):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class ApplicationTimelineServerDefault(ApplicationTimelineServer):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hadoop-yarn-timelineserver"}
+ import status_params
+ return {status_params.stack_name: "hadoop-yarn-timelineserver"}
def pre_upgrade_restart(self, env, upgrade_type=None):
Logger.info("Executing Stack Upgrade pre-restart")
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py
index e9ee529..9b8c5c0 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py
@@ -71,8 +71,8 @@ class HistoryserverWindows(HistoryServer):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class HistoryServerDefault(HistoryServer):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hadoop-mapreduce-historyserver"}
+ import status_params
+ return {status_params.stack_name: "hadoop-mapreduce-historyserver"}
def pre_upgrade_restart(self, env, upgrade_type=None):
Logger.info("Executing Stack Upgrade pre-restart")
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py
index 16f43dc..6eb04fb 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py
@@ -52,8 +52,8 @@ class MapReduce2ClientWindows(MapReduce2Client):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class MapReduce2ClientDefault(MapReduce2Client):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hadoop-client"}
+ import status_params
+ return {status_params.stack_name: "hadoop-client"}
def pre_upgrade_restart(self, env, upgrade_type=None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py
index dd6b130..6837c27 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py
@@ -66,8 +66,8 @@ class NodemanagerWindows(Nodemanager):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class NodemanagerDefault(Nodemanager):
def get_stack_to_component(self):
- import params
- return {params.stack_name: "hadoop-yarn-nodemanager"}
+ import status_params
+ return {status_params.stack_name: "hadoop-yarn-nodemanager"}
def pre_upgrade_restart(self, env, upgrade_type=None):
Logger.info("Executing NodeManager Stack Upgrade pre-restart")
http://git-wip-us.apache.org/repos/asf/ambari/blob/9be2ba28/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index 6f0b620..19dbb60 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -53,7 +53,7 @@ YARN_SERVER_ROLE_DIRECTORY_MAP = {
config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = status_params.stack_name
stack_root = Script.get_stack_root()
tarball_map = default("/configurations/cluster-env/tarball_map", None)