You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/02/13 14:59:10 UTC
git commit: AMBARI-4639. Hive Service Check fails on install for
CentOS 6.4 in secure mode. (Eugene Chekanskiy via dlysnichenko)
Updated Branches:
refs/heads/trunk 8ea3b178a -> a6224cfb4
AMBARI-4639. Hive Service Check fails on install for CentOS 6.4 in secure mode. (Eugene Chekanskiy via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6224cfb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6224cfb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6224cfb
Branch: refs/heads/trunk
Commit: a6224cfb451207410c1a261583348ed107e55c5d
Parents: 8ea3b17
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Feb 13 15:58:24 2014 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Feb 13 15:58:24 2014 +0200
----------------------------------------------------------------------
.../services/HIVE/package/scripts/hcat_service_check.py | 6 +++++-
.../services/HIVE/package/scripts/hcat_service_check.py | 6 +++++-
.../python/stacks/1.3.2/HIVE/test_hive_service_check.py | 12 +++++++++---
.../python/stacks/2.0.6/HIVE/test_hive_service_check.py | 6 ++++++
4 files changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6224cfb/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat_service_check.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat_service_check.py
index 3886c33..fdfaa81 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat_service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat_service_check.py
@@ -51,7 +51,11 @@ def hcat_service_check():
ExecuteHadoop(test_cmd,
user=params.hdfs_user,
logoutput=True,
- conf_dir=params.hadoop_conf_dir)
+ conf_dir=params.hadoop_conf_dir,
+ security_enabled=params.security_enabled,
+ kinit_path_local=params.kinit_path_local,
+ keytab=params.hdfs_user_keytab
+ )
cleanup_cmd = format("{kinit_cmd}sh /tmp/hcatSmoke.sh hcatsmoke{unique} cleanup")
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6224cfb/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py
index 36680ee..c0d1026 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py
@@ -50,7 +50,11 @@ def hcat_service_check():
ExecuteHadoop(test_cmd,
user=params.hdfs_user,
logoutput=True,
- conf_dir=params.hadoop_conf_dir)
+ conf_dir=params.hadoop_conf_dir,
+ security_enabled=params.security_enabled,
+ kinit_path_local=params.kinit_path_local,
+ keytab=params.hdfs_user_keytab
+ )
cleanup_cmd = format("{kinit_cmd}sh /tmp/hcatSmoke.sh hcatsmoke{unique} cleanup")
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6224cfb/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py
index 3b19451..56b8195 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py
@@ -60,6 +60,9 @@ class TestServiceCheck(RMFTestCase):
logoutput = True,
user = 'hdfs',
conf_dir = '/etc/hadoop/conf',
+ keytab=UnknownConfigurationMock(),
+ kinit_path_local='/usr/bin/kinit',
+ security_enabled=False
)
self.assertResourceCalled('Execute', 'sh /tmp/hcatSmoke.sh hcatsmoke cleanup',
logoutput = True,
@@ -103,9 +106,12 @@ class TestServiceCheck(RMFTestCase):
try_sleep = 5,
)
self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /apps/hive/warehouse/hcatsmoke',
- logoutput = True,
- user = 'hdfs',
- conf_dir = '/etc/hadoop/conf',
+ logoutput = True,
+ user = 'hdfs',
+ conf_dir = '/etc/hadoop/conf',
+ keytab='/etc/security/keytabs/hdfs.headless.keytab',
+ kinit_path_local='/usr/bin/kinit',
+ security_enabled=True
)
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; sh /tmp/hcatSmoke.sh hcatsmoke cleanup',
logoutput = True,
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6224cfb/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
index ee89fdb..c4c440f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
@@ -60,6 +60,9 @@ class TestServiceCheck(RMFTestCase):
logoutput = True,
user = 'hdfs',
conf_dir = '/etc/hadoop/conf',
+ keytab=UnknownConfigurationMock(),
+ kinit_path_local='/usr/bin/kinit',
+ security_enabled=False
)
self.assertResourceCalled('Execute', 'sh /tmp/hcatSmoke.sh hcatsmoke cleanup',
logoutput = True,
@@ -106,6 +109,9 @@ class TestServiceCheck(RMFTestCase):
logoutput = True,
user = 'hdfs',
conf_dir = '/etc/hadoop/conf',
+ keytab='/etc/security/keytabs/hdfs.headless.keytab',
+ kinit_path_local='/usr/bin/kinit',
+ security_enabled=True
)
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; sh /tmp/hcatSmoke.sh hcatsmoke cleanup',
logoutput = True,