Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A3C0210FA5 for ; Wed, 17 Jul 2013 00:38:26 +0000 (UTC) Received: (qmail 61713 invoked by uid 500); 17 Jul 2013 00:38:26 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 61667 invoked by uid 500); 17 Jul 2013 00:38:26 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 61600 invoked by uid 99); 17 Jul 2013 00:38:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jul 2013 00:38:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 28F328AB089; Wed, 17 Jul 2013 00:38:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swagle@apache.org To: ambari-commits@incubator.apache.org Date: Wed, 17 Jul 2013 00:38:27 -0000 Message-Id: <76bb0db629b04cb987b8e0a7ff0c2031@git.apache.org> In-Reply-To: <1c4397c775d64d75ae8c3f54837f5728@git.apache.org> References: <1c4397c775d64d75ae8c3f54837f5728@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: AMBARI-2665. Zookeeper throws an stacktrace on Ambari secure cluster. Missing changes. (swagle) AMBARI-2665. Zookeeper throws an stacktrace on Ambari secure cluster. Missing changes. (swagle) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/35523fca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/35523fca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/35523fca Branch: refs/heads/trunk Commit: 35523fca93182cf73f93d1d179a86e9415a61df6 Parents: a658a77 Author: Siddharth Wagle Authored: Tue Jul 16 17:30:05 2013 -0700 Committer: Siddharth Wagle Committed: Tue Jul 16 17:30:50 2013 -0700 ---------------------------------------------------------------------- .../modules/hdp-zookeeper/manifests/zookeeper/service_check.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/35523fca/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp index 25760fa..283c6ab 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp @@ -26,7 +26,8 @@ class hdp-zookeeper::zookeeper::service_check() $security_enabled = $hdp::params::security_enabled $smoke_test_user = $hdp::params::smokeuser $zookeeper_smoke_shell_files = ['zkService.sh'] - + $kinit_path = $hdp::params::kinit_path_local + $smoke_user_keytab = $hdp::params::smokeuser_keytab anchor { 'hdp-zookeeper::zookeeper::service_check::begin':} hdp-zookeeper::zookeeper_smoke_shell_file { $zookeeper_smoke_shell_files: } @@ -43,7 +44,7 @@ define hdp-zookeeper::zookeeper_smoke_shell_file() } exec { '/tmp/zkService.sh': - command => "sh /tmp/zkService.sh ${smoke_script} ${smoke_test_user} ${conf_dir} ${security_enabled}", + command => "sh /tmp/zkSmoke.sh ${smoke_script} ${smoke_test_user} ${conf_dir} ${clientPort} ${security_enabled} ${kinit_path} ${smoke_user_keytab}", tries => 3, try_sleep => 5, require => File['/tmp/zkService.sh'],