You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2017/03/18 00:42:40 UTC
ambari git commit: AMBARI-20489. HBase service check reports success
despite failures (Myroslav Papirkovskyi via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 e246780f9 -> 1cf462026
AMBARI-20489. HBase service check reports success despite failures (Myroslav Papirkovskyi via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cf46202
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cf46202
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cf46202
Branch: refs/heads/branch-2.5
Commit: 1cf462026f1300dc0a081eebc9db637d6bf41f71
Parents: e246780
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Mar 17 17:42:09 2017 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Mar 17 17:42:13 2017 -0700
----------------------------------------------------------------------
.../HBASE/0.96.0.2.0/package/scripts/service_check.py | 3 ++-
.../test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf46202/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
index a440c10..29c9ef1 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
@@ -46,7 +46,7 @@ class HbaseServiceCheckDefault(HbaseServiceCheck):
env.set_params(params)
output_file = "/apps/hbase/data/ambarismoketest"
- smokeuser_kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal};") if params.security_enabled else ""
+ smokeuser_kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal} &&") if params.security_enabled else ""
hbase_servicecheck_file = format("{exec_tmp_dir}/hbase-smoke.sh")
hbase_servicecheck_cleanup_file = format("{exec_tmp_dir}/hbase-smoke-cleanup.sh")
@@ -78,6 +78,7 @@ class HbaseServiceCheckDefault(HbaseServiceCheck):
Execute( grantprivelegecmd,
user = params.hbase_user,
+ logoutput = True
)
servicecheckcmd = format("{smokeuser_kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} shell {hbase_servicecheck_file}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf46202/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
index f63abac..60a99ef 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
@@ -85,8 +85,9 @@ class TestServiceCheck(RMFTestCase):
)
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hbase.headless.keytab hbase; /usr/lib/hbase/bin/hbase shell /tmp/hbase_grant_permissions.sh',
user = 'hbase',
+ logoutput = True
)
- self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa@EXAMPLE.COM; /usr/lib/hbase/bin/hbase --config /etc/hbase/conf shell /tmp/hbase-smoke.sh && /tmp/hbaseSmokeVerify.sh /etc/hbase/conf /usr/lib/hbase/bin/hbase && /usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa@EXAMPLE.COM; /usr/lib/hbase/bin/hbase --config /etc/hbase/conf shell /tmp/hbase-smoke-cleanup.sh',
+ self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa@EXAMPLE.COM && /usr/lib/hbase/bin/hbase --config /etc/hbase/conf shell /tmp/hbase-smoke.sh && /tmp/hbaseSmokeVerify.sh /etc/hbase/conf /usr/lib/hbase/bin/hbase && /usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa@EXAMPLE.COM && /usr/lib/hbase/bin/hbase --config /etc/hbase/conf shell /tmp/hbase-smoke-cleanup.sh',
logoutput = True,
tries = 6,
user = 'ambari-qa',