Repository: ambari Updated Branches: refs/heads/trunk ce5cc87c5 -> 91155dd15
AMBARI-10311. Changing templeton port results in Hive Service check failure (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/91155dd1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/91155dd1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/91155dd1 Branch: refs/heads/trunk Commit: 91155dd15cdab133e21cf7617891551e7ac9fb71 Parents: ce5cc87 Author: Andrew Onishuk <[email protected]> Authored: Wed Apr 1 18:17:23 2015 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Wed Apr 1 18:17:23 2015 +0300 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/files/templetonSmoke.sh | 11 ++++++----- .../HIVE/0.12.0.2.0/package/scripts/params.py | 2 ++ .../0.12.0.2.0/package/scripts/webhcat_service_check.py | 2 +- .../python/stacks/2.0.6/HIVE/test_hive_service_check.py | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/91155dd1/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/files/templetonSmoke.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/files/templetonSmoke.sh b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/files/templetonSmoke.sh index 209f345..d16848d 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/files/templetonSmoke.sh +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/files/templetonSmoke.sh @@ -22,11 +22,12 @@ export ttonhost=$1 export smoke_test_user=$2 -export smoke_user_keytab=$3 -export security_enabled=$4 -export kinit_path_local=$5 -export smokeuser_principal=$6 -export ttonurl="http://${ttonhost}:50111/templeton/v1"; +export templeton_port=$3 +export smoke_user_keytab=$4 +export security_enabled=$5 +export kinit_path_local=$6 +export smokeuser_principal=$7 +export ttonurl="http://${ttonhost}:${templeton_port}/templeton/v1"; if [[ $security_enabled == "true" ]]; then kinitcmd="${kinit_path_local} -kt ${smoke_user_keytab} ${smokeuser_principal}; " http://git-wip-us.apache.org/repos/asf/ambari/blob/91155dd1/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py index 69ac68d..e4e52b8 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py @@ -137,6 +137,8 @@ check_db_connection_jar = format("/usr/lib/ambari-agent/{check_db_connection_jar hive_jdbc_drivers_list = ["com.microsoft.sqlserver.jdbc.SQLServerDriver","com.mysql.jdbc.Driver","org.postgresql.Driver","oracle.jdbc.driver.OracleDriver"] downloaded_custom_connector = format("{tmp_dir}/{jdbc_jar_name}") prepackaged_ojdbc_symlink = format("{hive_lib}/ojdbc6.jar") +templeton_port = config['configurations']['webhcat-site']['templeton.port'] + #common hive_metastore_hosts = config['clusterHostInfo']['hive_metastore_host'] http://git-wip-us.apache.org/repos/asf/ambari/blob/91155dd1/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py index e9d1f18..bea1f56 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py @@ -34,7 +34,7 @@ def webhcat_service_check(): smokeuser_keytab= "no_keytab" smoke_user_principal="no_principal" - cmd = format("{tmp_dir}/templetonSmoke.sh {webhcat_server_host[0]} {smokeuser} {smokeuser_keytab}" + cmd = format("{tmp_dir}/templetonSmoke.sh {webhcat_server_host[0]} {smokeuser} {templeton_port} {smokeuser_keytab}" " {security_param} {kinit_path_local} {smoke_user_principal}") Execute(cmd, http://git-wip-us.apache.org/repos/asf/ambari/blob/91155dd1/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 8e138e5..e43917d 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 @@ -77,7 +77,7 @@ class TestServiceCheck(RMFTestCase): content = StaticFile('templetonSmoke.sh'), mode = 0755, ) - self.assertResourceCalled('Execute', '/tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa no_keytab false /usr/bin/kinit no_principal', + self.assertResourceCalled('Execute', '/tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa 50111 no_keytab false /usr/bin/kinit no_principal', logoutput = True, path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries = 3, @@ -141,7 +141,7 @@ class TestServiceCheck(RMFTestCase): content = StaticFile('templetonSmoke.sh'), mode = 0755, ) - self.assertResourceCalled('Execute', '/tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa /etc/security/keytabs/smokeuser.headless.keytab true /usr/bin/kinit [email protected]', + self.assertResourceCalled('Execute', '/tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa 50111 /etc/security/keytabs/smokeuser.headless.keytab true /usr/bin/kinit [email protected]', logoutput = True, path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries = 3,
