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 E688D200B5F for ; Fri, 29 Jul 2016 19:02:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E5370160A6E; Fri, 29 Jul 2016 17:02:47 +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 6CB7A160AC6 for ; Fri, 29 Jul 2016 19:02:45 +0200 (CEST) Received: (qmail 74990 invoked by uid 500); 29 Jul 2016 17:02:44 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 73142 invoked by uid 99); 29 Jul 2016 17:02:43 -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; Fri, 29 Jul 2016 17:02:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 791F9ED22A; Fri, 29 Jul 2016 17:02:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oflebbe@apache.org To: commits@bigtop.apache.org Date: Fri, 29 Jul 2016 17:03:18 -0000 Message-Id: <6f7c0ee606c74354868e95371239aa9b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [37/51] [abbrv] bigtop git commit: BIGTOP-2462: Make Spark events and history logs directory configurable archived-at: Fri, 29 Jul 2016 17:02:48 -0000 BIGTOP-2462: Make Spark events and history logs directory configurable Signed-off-by: Olaf Flebbe Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/5e46a98e Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/5e46a98e Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/5e46a98e Branch: refs/heads/BIGTOP-2253 Commit: 5e46a98ee836d58d8e2d4a8fa4fc55eaaa25cac4 Parents: 0bad860 Author: Cory Johns Authored: Thu May 26 16:56:55 2016 -0400 Committer: Olaf Flebbe Committed: Wed Jun 22 21:38:36 2016 +0200 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/spark/manifests/init.pp | 2 ++ bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/5e46a98e/bigtop-deploy/puppet/modules/spark/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/spark/manifests/init.pp b/bigtop-deploy/puppet/modules/spark/manifests/init.pp index ee42821..f5a2d64 100644 --- a/bigtop-deploy/puppet/modules/spark/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/spark/manifests/init.pp @@ -143,6 +143,8 @@ class spark { $worker_ui_port = 8081, $history_ui_port = 18080, $use_yarn_shuffle_service = false, + $event_log_dir = "hdfs:///var/log/spark/apps", + $history_log_dir = "hdfs:///var/log/spark/apps", ) { package { 'spark-core': http://git-wip-us.apache.org/repos/asf/bigtop/blob/5e46a98e/bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf b/bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf index bdb9e56..30946b3 100644 --- a/bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf +++ b/bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf @@ -15,8 +15,8 @@ spark.master <%= @master_url %> spark.eventLog.enabled true -spark.eventLog.dir hdfs:///var/log/spark/apps -spark.history.fs.logDirectory hdfs:///var/log/spark/apps +spark.eventLog.dir <%= @event_log_dir %> +spark.history.fs.logDirectory <%= @history_log_dir %> spark.yarn.historyServer.address <%= @master_host %>:<%= @history_ui_port %> spark.history.ui.port <%= @history_ui_port %> spark.shuffle.service.enabled <%= @use_yarn_shuffle_service %>