You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2015/09/17 20:47:16 UTC
ambari git commit: AMBARI-13027. AMS status should indicate failure
in a dead RS scenario. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 fefbf7f31 -> c2fa9ebc7
AMBARI-13027. AMS status should indicate failure in a dead RS scenario. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2fa9ebc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2fa9ebc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2fa9ebc
Branch: refs/heads/branch-2.1
Commit: c2fa9ebc7189c60e429eebbe439f6c4c91e6ba70
Parents: fefbf7f
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Thu Sep 17 21:39:12 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Thu Sep 17 21:46:38 2015 +0300
----------------------------------------------------------------------
.../AMBARI_METRICS/0.1.0/package/scripts/hbase.py | 5 +++++
.../AMBARI_METRICS/0.1.0/package/scripts/params.py | 1 +
.../AMBARI_METRICS/0.1.0/package/scripts/status.py | 4 ++++
.../stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py | 2 ++
4 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2fa9ebc/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
index bb3f17f..1d9bf23 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
@@ -195,6 +195,9 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
params.HdfsResource(None, action="execute")
+ #Workaround for status commands not aware of operating mode
+ File(format("{params.hbase_pid_dir}/distributed_mode"), action="create", mode=0644, owner=params.hbase_user)
+
pass
else:
@@ -211,6 +214,8 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
recursive = True
)
+ File(format("{params.hbase_pid_dir}/distributed_mode"), action="delete", owner=params.hbase_user)
+
if name != "client":
Directory( params.hbase_pid_dir,
owner = params.hbase_user,
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2fa9ebc/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index d9e8cba..23fe77f 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -71,6 +71,7 @@ hbase_included_hosts = config['commandParams']['included_hosts']
hbase_user = status_params.hbase_user
smokeuser = config['configurations']['cluster-env']['smokeuser']
hbase_root_dir = config['configurations']['ams-hbase-site']['hbase.rootdir']
+hbase_pid_dir = status_params.hbase_pid_dir
is_hbase_distributed = hbase_root_dir.startswith('hdfs://')
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2fa9ebc/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
index 1e9173d..59466ad 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
@@ -20,6 +20,7 @@ limitations under the License.
from resource_management import *
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
+import os
@OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
def check_service_status(name):
@@ -28,6 +29,9 @@ def check_service_status(name):
check_process_status(pid_file)
pid_file = format("{hbase_pid_dir}/hbase-{hbase_user}-master.pid")
check_process_status(pid_file)
+ if os.path.exists(format("{hbase_pid_dir}/distributed_mode")):
+ pid_file = format("{hbase_pid_dir}/hbase-{hbase_user}-regionserver.pid")
+ check_process_status(pid_file)
elif name == 'monitor':
pid_file = format("{ams_monitor_pid_dir}/ambari-metrics-monitor.pid")
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2fa9ebc/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
index 34135ff..7b08541 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
@@ -253,6 +253,8 @@ class TestOozieClient(RMFTestCase):
principal_name=UnknownConfigurationMock(),
default_fs='hdfs://c6401.ambari.apache.org:8020',
)
+ self.assertResourceCalled('File', '/var/run/ambari-metrics-collector//distributed_mode', action=["create"],
+ mode=0644, owner='ams')
self.assertResourceCalled('Directory', '/var/run/ambari-metrics-collector/',
owner = 'ams',
recursive = True