Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 04C2C179DA for ; Tue, 22 Sep 2015 10:37:01 +0000 (UTC) Received: (qmail 17839 invoked by uid 500); 22 Sep 2015 10:37:00 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 17810 invoked by uid 500); 22 Sep 2015 10:37:00 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 17800 invoked by uid 99); 22 Sep 2015 10:37:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Sep 2015 10:37:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A7F6BE0280; Tue, 22 Sep 2015 10:37:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Message-Id: <3f0e51c7e0d14951b429e67625e03e7f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-13126. RU: Webhcat restart failed on Debian 7 (aonishuk) Date: Tue, 22 Sep 2015 10:37:00 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 528be0a33 -> 82b2b960e AMBARI-13126. RU: Webhcat restart failed on Debian 7 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/82b2b960 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/82b2b960 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/82b2b960 Branch: refs/heads/trunk Commit: 82b2b960e4ae4b2de2cc39c38a9e62667b0c6020 Parents: 528be0a Author: Andrew Onishuk Authored: Tue Sep 22 13:36:27 2015 +0300 Committer: Andrew Onishuk Committed: Tue Sep 22 13:36:27 2015 +0300 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/webhcat.py | 8 ++++-- .../stacks/2.0.6/HIVE/test_webhcat_server.py | 27 ++++++++++++-------- 2 files changed, 23 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/82b2b960/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py index 48b5cbc..b597852 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py @@ -95,13 +95,17 @@ def webhcat(): conf_dir = format("/usr/hdp/{version}/hive/conf"), configurations = params.config['configurations']['hive-site'], configuration_attributes = params.config['configuration_attributes']['hive-site'], - owner = params.hive_user) + owner = params.hive_user, + group = params.user_group, + ) XmlConfig("yarn-site.xml", conf_dir = format("/usr/hdp/{version}/hadoop/conf"), configurations = params.config['configurations']['yarn-site'], configuration_attributes = params.config['configuration_attributes']['yarn-site'], - owner = params.yarn_user) + owner = params.yarn_user, + group = params.user_group, + ) File(format("{config_dir}/webhcat-env.sh"), http://git-wip-us.apache.org/repos/asf/ambari/blob/82b2b960/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py index 469f6a2..aca7664 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py @@ -451,17 +451,24 @@ class TestWebHCatServer(RMFTestCase): configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site']) self.assertResourceCalled('XmlConfig', 'hive-site.xml', - owner = 'hive', - conf_dir = '/usr/hdp/2.3.0.0-1234/hive/conf', - configurations = self.getConfig()['configurations']['hive-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hive-site']) - + owner = 'hive', + group = 'hadoop', + conf_dir = '/usr/hdp/2.3.0.0-1234/hive/conf', + configuration_attributes = {u'final': {u'hive.optimize.bucketmapjoin.sortedmerge': u'true', + u'javax.jdo.option.ConnectionDriverName': u'true', + u'javax.jdo.option.ConnectionPassword': u'true'}}, + configurations = self.getConfig()['configurations']['hive-site'], + ) self.assertResourceCalled('XmlConfig', 'yarn-site.xml', - owner = 'yarn', - conf_dir = '/usr/hdp/2.3.0.0-1234/hadoop/conf', - configurations = self.getConfig()['configurations']['yarn-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['yarn-site']) - + owner = 'yarn', + group = 'hadoop', + conf_dir = '/usr/hdp/2.3.0.0-1234/hadoop/conf', + configuration_attributes = {u'final': {u'yarn.nodemanager.container-executor.class': u'true', + u'yarn.nodemanager.disk-health-checker.min-healthy-disks': u'true', + u'yarn.nodemanager.local-dirs': u'true'}}, + configurations = self.getConfig()['configurations']['yarn-site'], + ) + self.assertResourceCalled('File', '/usr/hdp/current/hive-webhcat/etc/webhcat/webhcat-env.sh', content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), owner = 'hcat',