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 A8FB9108AC for ; Sun, 15 Mar 2015 15:15:10 +0000 (UTC) Received: (qmail 54482 invoked by uid 500); 15 Mar 2015 15:15:10 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 54453 invoked by uid 500); 15 Mar 2015 15:15:10 -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 54375 invoked by uid 99); 15 Mar 2015 15:15:10 -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; Sun, 15 Mar 2015 15:15:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2E47CE1072; Sun, 15 Mar 2015 15:15:10 +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 Date: Sun, 15 Mar 2015 15:15:11 -0000 Message-Id: <6997d8b65d3e4245b3ecad2dbf68130f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ambari git commit: AMBARI-10074. WEBHCAT_SERVER can not start on Ubuntu (aonishuk) AMBARI-10074. WEBHCAT_SERVER can not start on Ubuntu (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/90607efb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/90607efb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/90607efb Branch: refs/heads/branch-2.0.0 Commit: 90607efbca8ffaeb2bf8bd8cf32486d413e947ca Parents: 1c67dfd Author: Andrew Onishuk Authored: Sun Mar 15 17:14:46 2015 +0200 Committer: Andrew Onishuk Committed: Sun Mar 15 17:14:46 2015 +0200 ---------------------------------------------------------------------- .../common-services/HIVE/0.12.0.2.0/package/scripts/params.py | 1 + .../common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py | 4 ++++ .../src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py | 6 ++++++ 3 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/90607efb/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 d38192d..913e0f5 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 @@ -106,6 +106,7 @@ execute_path = os.environ['PATH'] + os.pathsep + hive_bin + os.pathsep + hadoop_ hive_metastore_user_name = config['configurations']['hive-site']['javax.jdo.option.ConnectionUserName'] hive_jdbc_connection_url = config['configurations']['hive-site']['javax.jdo.option.ConnectionURL'] +webhcat_conf_dir = status_params.webhcat_conf_dir hive_metastore_user_passwd = config['configurations']['hive-site']['javax.jdo.option.ConnectionPassword'] hive_metastore_db_type = config['configurations']['hive-env']['hive_database_type'] #HACK Temporarily use dbType=azuredb while invoking schematool http://git-wip-us.apache.org/repos/asf/ambari/blob/90607efb/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 a70ee7f..b2008ab 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 @@ -147,6 +147,10 @@ def webhcat(): group=params.user_group, content=InlineTemplate(params.webhcat_env_sh_template) ) + + Directory(params.webhcat_conf_dir, + cd_access='a', + ) log4j_webhcat_filename = 'webhcat-log4j.properties' if (params.log4j_webhcat_props != None): http://git-wip-us.apache.org/repos/asf/ambari/blob/90607efb/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 2663d18..d070980 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 @@ -212,6 +212,9 @@ class TestWebHCatServer(RMFTestCase): owner = 'hcat', group = 'hadoop', ) + self.assertResourceCalled('Directory', '/etc/hive-webhcat/conf', + cd_access = 'a', + ) self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-log4j.properties', content = 'log4jproperties\nline2', owner = 'hcat', @@ -320,6 +323,9 @@ class TestWebHCatServer(RMFTestCase): owner = 'hcat', group = 'hadoop', ) + self.assertResourceCalled('Directory', '/etc/hive-webhcat/conf', + cd_access = 'a', + ) self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-log4j.properties', content = 'log4jproperties\nline2', owner = 'hcat',