Repository: ambari Updated Branches: refs/heads/trunk b36f00e2b -> 2db72cdf6
AMBARI-19953: AMS HBase RegionServer process is still alive after switching AMS to embedded mode. (Qin Liu via avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2db72cdf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2db72cdf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2db72cdf Branch: refs/heads/trunk Commit: 2db72cdf667a174d43eb7fa3c45166b1734948ae Parents: dd6fb57 Author: Aravindan Vijayan <avija...@hortonworks.com> Authored: Wed Feb 15 08:45:07 2017 -0800 Committer: Aravindan Vijayan <avija...@hortonworks.com> Committed: Wed Feb 15 11:06:44 2017 -0800 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/package/scripts/ams_service.py | 4 ++++ .../stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py | 8 ++++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2db72cdf/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py index f423165..875211f 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py @@ -55,6 +55,10 @@ def ams_service(name, action): hbase_service('master', action=action) hbase_service('regionserver', action=action) cmd = format("{cmd} --distributed") + else: + # make sure no residual region server process is running in embedded mode + if action == 'stop': + hbase_service('regionserver', action=action) if action == 'start': Execute(format("{sudo} rm -rf {hbase_tmp_dir}/*.tmp") http://git-wip-us.apache.org/repos/asf/ambari/blob/2db72cdf/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 7df74bf..900ccfb 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 @@ -98,6 +98,14 @@ class TestMetricsCollector(RMFTestCase): self.assert_hbase_configure('master') self.assert_hbase_configure('regionserver') self.assert_ams('collector') + self.assertResourceCalled('Execute', '/usr/lib/ams-hbase/bin/hbase-daemon.sh --config /etc/ams-hbase/conf stop regionserver', + on_timeout = 'ls /var/run/ambari-metrics-collector//hbase-ams-regionserver.pid >/dev/null 2>&1 && ps `cat /var/run/ambari-metrics-collector//hbase-ams-regionserver.pid` >/dev/null 2>&1 && ambari-sudo.sh -H -E kill -9 `ambari-sudo.sh cat /var/run/ambari-metrics-collector//hbase-ams-regionserver.pid`', + timeout = 30, + user = 'ams' + ) + self.assertResourceCalled('File', '/var/run/ambari-metrics-collector//hbase-ams-regionserver.pid', + action = ['delete'] + ) self.assertResourceCalled('Execute', '/usr/sbin/ambari-metrics-collector --config /etc/ambari-metrics-collector/conf stop', user = 'ams' )
