Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BEF28200B16 for ; Mon, 20 Jun 2016 22:57:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BDB9D160A26; Mon, 20 Jun 2016 20:57:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F1689160A55 for ; Mon, 20 Jun 2016 22:57:58 +0200 (CEST) Received: (qmail 19736 invoked by uid 500); 20 Jun 2016 20:57:58 -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 19713 invoked by uid 99); 20 Jun 2016 20:57:58 -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; Mon, 20 Jun 2016 20:57:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EEA25DFC6F; Mon, 20 Jun 2016 20:57:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbhowmick@apache.org To: commits@ambari.apache.org Message-Id: <2006e3fbc951414187d9f8dc4ba23369@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17316 [Zeppelin][Ambari] Service restart fails if one modifies the parameter zeppelin_log_dir. (Renjith Kamath via dipayanb) Date: Mon, 20 Jun 2016 20:57:57 +0000 (UTC) archived-at: Mon, 20 Jun 2016 20:57:59 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.4 520811726 -> a270c72db AMBARI-17316 [Zeppelin][Ambari] Service restart fails if one modifies the parameter zeppelin_log_dir. (Renjith Kamath via dipayanb) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a270c72d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a270c72d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a270c72d Branch: refs/heads/branch-2.4 Commit: a270c72db800de83c9af6b739c2f78aa30dad702 Parents: 5208117 Author: Dipayan Bhowmick Authored: Tue Jun 21 02:26:52 2016 +0530 Committer: Dipayan Bhowmick Committed: Tue Jun 21 02:27:36 2016 +0530 ---------------------------------------------------------------------- .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml | 5 +++++ .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a270c72d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml index 2f5ac59..a912272 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml @@ -21,6 +21,11 @@ zeppelin_pid_dir /var/run/zeppelin Dir containing process ID file + + directory + false + true +

http://git-wip-us.apache.org/repos/asf/ambari/blob/a270c72d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index fd73464..22d66b0 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -41,15 +41,16 @@ class Master(Script): owner=params.zeppelin_user, group=params.zeppelin_group, cd_access="a", + create_parents=True, mode=0755 ) - Execute('echo spark_version:' + params.spark_version + ' detected for spark_home: ' - + params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user) - # update the configs specified by user self.configure(env) + Execute('echo spark_version:' + params.spark_version + ' detected for spark_home: ' + + params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user) + # run setup_snapshot.sh Execute(format("{service_packagedir}/scripts/setup_snapshot.sh {zeppelin_dir} " "{hive_metastore_host} {hive_metastore_port} {hive_server_port} " @@ -102,6 +103,7 @@ class Master(Script): owner=params.zeppelin_user, group=params.zeppelin_group, cd_access="a", + create_parents=True, mode=0755 )