Repository: ambari Updated Branches: refs/heads/branch-2.1 6ea0cd9a0 -> 8d59cb564
AMBARI-13133. Hive Metastore did not start when Kerberized (rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d59cb56 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d59cb56 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d59cb56 Branch: refs/heads/branch-2.1 Commit: 8d59cb56494bd03a2da5f6acca3e7d41e89c254a Parents: 6ea0cd9 Author: Robert Levas <rle...@hortonworks.com> Authored: Fri Sep 18 10:51:03 2015 -0400 Committer: Robert Levas <rle...@hortonworks.com> Committed: Fri Sep 18 10:51:03 2015 -0400 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/hive_service.py | 4 ---- .../HIVE/0.12.0.2.0/package/scripts/status_params.py | 1 + .../src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py | 3 --- .../src/test/python/stacks/2.0.6/HIVE/test_hive_server.py | 4 ---- .../src/test/python/stacks/2.1/HIVE/test_hive_metastore.py | 4 ---- 5 files changed, 1 insertion(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8d59cb56/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py index cab6d0d..02df399 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py @@ -78,10 +78,6 @@ def hive_service(name, action='start', rolling_restart=False): import os hadoop_home = format("/usr/hdp/{version}/hadoop") hive_bin = os.path.join(params.hive_bin, hive_bin) - - if params.security_enabled: - hive_kinit_cmd = format("{kinit_path_local} -kt {hive_server2_keytab} {hive_principal}; ") - Execute(hive_kinit_cmd, user=params.hive_user) Execute(daemon_cmd, user = params.hive_user, http://git-wip-us.apache.org/repos/asf/ambari/blob/8d59cb56/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 a9b6628..8c035db 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 @@ -95,6 +95,7 @@ else: # this is NOT a typo. HDP-2.3 configs for hcatalog/webhcat point to a # specific directory which is NOT called 'conf' webhcat_conf_dir = '/usr/hdp/current/hive-webhcat/etc/webhcat' + hive_conf_dir = hive_server_conf_dir hive_config_dir = hive_client_conf_dir if 'role' in config and config['role'] in ["HIVE_SERVER", "HIVE_METASTORE"]: http://git-wip-us.apache.org/repos/asf/ambari/blob/8d59cb56/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py index a39fac7..328b52d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py @@ -105,9 +105,6 @@ class TestHiveMetastore(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hive.service.keytab hive/c6401.ambari.apache....@example.com; ', - user = 'hive', - ) self.assertResourceCalled('Execute', '/tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive', environment = {'HADOOP_HOME': '/usr', 'HIVE_BIN': 'hive', http://git-wip-us.apache.org/repos/asf/ambari/blob/8d59cb56/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py index 83328c1..76b6af4 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py @@ -241,10 +241,6 @@ class TestHiveServer(RMFTestCase): ) self.assert_configure_secured() - self.assertResourceCalled('Execute', - '/usr/bin/kinit -kt /etc/security/keytabs/hive.service.keytab hive/c6401.ambari.apache....@example.com; ', - user='hive', - ) self.assertResourceCalled('Execute', '/tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive', environment = {'HADOOP_HOME': '/usr', 'HIVE_BIN': 'hive', http://git-wip-us.apache.org/repos/asf/ambari/blob/8d59cb56/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py index 7075345..6eeacbe 100644 --- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py @@ -139,10 +139,6 @@ class TestHiveMetastore(RMFTestCase): ) self.assert_configure_secured() - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hive.service.keytab hive/c6401.ambari.apache....@example.com; ', - user = 'hive', - ) - self.assertResourceCalled('Execute', '/tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive', environment = {'HADOOP_HOME': '/usr', 'HIVE_BIN': 'hive',
