Author: jaimin
Date: Thu Mar 28 00:20:54 2013
New Revision: 1461908
URL: http://svn.apache.org/r1461908
Log:
AMBARI-1730. Hive Service check fails in non secure cluster (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1461908&r1=1461907&r2=1461908&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Mar 28 00:20:54 2013
@@ -532,6 +532,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1730. Hive Service check fails in non secure cluster. (jaimin)
+
AMBARI-1724. Agent has it hard-coded that HDP repo file can only be
downloaded once. (smohanty)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp?rev=1461908&r1=1461907&r2=1461908&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp
Thu Mar 28 00:20:54 2013
@@ -30,13 +30,11 @@ class hdp-hive::hive::service_check() in
$kinit_cmd = "${hdp::params::kinit_path_local} -kt ${smoke_user_keytab}
${smoke_test_user};"
$hive_principal_ext =
"principal=${hive_user}/_HOST@${hdp::params::kerberos_domain}"
$hive_url_ext = "${hive_url}\;${hive_principal_ext}"
+ $smoke_cmd = "${kinit_cmd} env JAVA_HOME=${hdp::params::java64_home}
${smoke_test_path} ${hive_url_ext} ${smoke_test_sql}"
} else {
- $kinit_cmd = ""
- $hive_principal_ext = ""
- $hive_url_ext = $hive_url
+ $smoke_cmd = "env JAVA_HOME=$hdp::params::java64_home $smoke_test_path
$hive_url $smoke_test_sql"
}
- $smoke_cmd = "${kinit_cmd} env JAVA_HOME=${hdp::params::java64_home}
${smoke_test_path} ${hive_url_ext} ${smoke_test_sql}"
file { $smoke_test_path:
ensure => present,
