You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by kw...@apache.org on 2017/02/03 15:32:52 UTC
bigtop git commit: BIGTOP-2603: add spark user/group to hadoop charms
(closes #163)
Repository: bigtop
Updated Branches:
refs/heads/master 9549a8e47 -> 8e4d9734e
BIGTOP-2603: add spark user/group to hadoop charms (closes #163)
Signed-off-by: Kevin W Monroe <ke...@canonical.com>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8e4d9734
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8e4d9734
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8e4d9734
Branch: refs/heads/master
Commit: 8e4d9734ec42628263ca084d4e799619b53a8116
Parents: 9549a8e
Author: Kevin W Monroe <ke...@canonical.com>
Authored: Tue Nov 22 23:38:58 2016 +0000
Committer: Kevin W Monroe <ke...@canonical.com>
Committed: Fri Feb 3 09:32:11 2017 -0600
----------------------------------------------------------------------
.../src/charm/hadoop/layer-hadoop-namenode/layer.yaml | 9 ++++++---
.../charm/hadoop/layer-hadoop-namenode/reactive/namenode.py | 8 ++++----
.../charm/hadoop/layer-hadoop-resourcemanager/layer.yaml | 7 ++++++-
.../reactive/resourcemanager.py | 5 ++++-
4 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8e4d9734/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml
index 3fca827..2709e8d 100644
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml
@@ -8,14 +8,17 @@ options:
apache-bigtop-base:
groups:
- 'mapred'
+ - 'spark'
- 'yarn'
users:
mapred:
- groups: ['hadoop', 'mapred']
+ groups: ['mapred', 'hadoop']
+ spark:
+ groups: ['spark', 'hadoop']
ubuntu:
- groups: ['hadoop', 'mapred']
+ groups: ['hadoop', 'mapred', 'spark']
yarn:
- groups: ['hadoop', 'yarn']
+ groups: ['yarn', 'hadoop']
ports:
namenode:
port: 8020
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8e4d9734/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/reactive/namenode.py
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/reactive/namenode.py b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/reactive/namenode.py
index 2faee7f..1e41b42 100644
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/reactive/namenode.py
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/reactive/namenode.py
@@ -78,10 +78,10 @@ def install_namenode():
# requirement.
utils.initialize_kv_host()
- # We need to create the 'mapred' user/group since we are not installing
- # hadoop-mapreduce. This is needed so the namenode can access yarn
- # job history files in hdfs. Also add our ubuntu user to the hadoop
- # and mapred groups.
+ # We need to create the 'mapred' and 'spark' user/group since we may not
+ # be installing hadoop-mapreduce or spark on this machine. This is needed
+ # so the namenode can access yarn and spark job history files in hdfs. Also
+ # add our ubuntu user to the hadoop, mapred, and spark groups.
get_layer_opts().add_users()
set_state('apache-bigtop-namenode.installed')
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8e4d9734/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/layer.yaml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/layer.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/layer.yaml
index c2e3420..3ec7644 100644
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/layer.yaml
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/layer.yaml
@@ -7,9 +7,14 @@ includes:
- 'interface:benchmark'
options:
apache-bigtop-base:
+ groups:
+ - 'mapred'
+ - 'spark'
users:
+ spark:
+ groups: ['spark', 'hadoop']
ubuntu:
- groups: ['hadoop', 'mapred']
+ groups: ['hadoop', 'mapred', 'spark']
ports:
resourcemanager:
port: 8032
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8e4d9734/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/reactive/resourcemanager.py
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/reactive/resourcemanager.py b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/reactive/resourcemanager.py
index c6984e3..b0cf302 100644
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/reactive/resourcemanager.py
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/reactive/resourcemanager.py
@@ -109,7 +109,10 @@ def install_resourcemanager(namenode):
# requirement.
utils.initialize_kv_host()
- # Add our ubuntu user to the hadoop and mapred groups.
+ # We need to create the 'spark' user/group since we may not be
+ # installing spark on this machine. This is needed so the history
+ # server can access spark job history files in hdfs. Also add our
+ # ubuntu user to the hadoop, mapred, and spark groups on this machine.
get_layer_opts().add_users()
set_state('apache-bigtop-resourcemanager.installed')