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 2019/10/31 19:42:30 UTC
[bigtop] branch master updated: BIGTOP-3015: juju bundle: remove
'client' from hadoop-spark
This is an automated email from the ASF dual-hosted git repository.
kwmonroe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 958040c BIGTOP-3015: juju bundle: remove 'client' from hadoop-spark
958040c is described below
commit 958040c44d3a44daf75de6e46fd24e7c65f8a560
Author: jamesbeedy <ja...@gmail.com>
AuthorDate: Wed Mar 21 10:43:29 2018 -0700
BIGTOP-3015: juju bundle: remove 'client' from hadoop-spark
Closes #348
Signed-off-by: Kevin W Monroe <ke...@canonical.com>
---
bigtop-deploy/juju/hadoop-spark/README.md | 8 +++-----
bigtop-deploy/juju/hadoop-spark/bundle-local.yaml | 12 +-----------
bigtop-deploy/juju/hadoop-spark/bundle.yaml | 12 +-----------
bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py | 3 +--
4 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/bigtop-deploy/juju/hadoop-spark/README.md b/bigtop-deploy/juju/hadoop-spark/README.md
index 14cbb86..2f6e5e4 100644
--- a/bigtop-deploy/juju/hadoop-spark/README.md
+++ b/bigtop-deploy/juju/hadoop-spark/README.md
@@ -48,14 +48,12 @@ follows:
* Slave (DataNode and NodeManager) v2.7.3
* 3 separate units
* Spark (Driver in yarn-client mode) v2.1.1
- * Client (Hadoop endpoint)
- * Colocated on the Spark unit
* Plugin (Facilitates communication with the Hadoop cluster)
- * Colocated on the Spark/Client unit
+ * Colocated on the Spark unit
* Ganglia (Web interface for monitoring cluster metrics)
- * Colocated on the Spark/Client unit
+ * Colocated on the Spark unit
* Rsyslog (Aggregate cluster syslog events in a single location)
- * Colocated on the Spark/Client unit
+ * Colocated on the Spark unit
Deploying this bundle results in a fully configured Apache Bigtop
cluster on any supported cloud, which can be scaled to meet workload
diff --git a/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml b/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml
index a469c42..7adc6d3 100644
--- a/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml
+++ b/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml
@@ -1,6 +1,6 @@
series: xenial
description: >
- This is a nine unit big data cluster that includes Hadoop 2.7 and Spark 2.1
+ This is an eight unit big data cluster that includes Hadoop 2.7 and Spark 2.1
from Apache Bigtop. Use it to analyse batch data with MapReduce or streaming
data with Spark. It will run on 5 machines in your cloud.
services:
@@ -38,15 +38,6 @@ services:
annotations:
gui-x: "1000"
gui-y: "400"
- client:
- charm: "cs:xenial/hadoop-client-9"
- constraints: "mem=7G root-disk=32G"
- num_units: 1
- annotations:
- gui-x: "1250"
- gui-y: "400"
- to:
- - "4"
spark:
charm: "/home/ubuntu/charms/xenial/spark"
constraints: "mem=7G root-disk=32G"
@@ -91,7 +82,6 @@ relations:
- [plugin, namenode]
- [plugin, resourcemanager]
- [spark, plugin]
- - [client, plugin]
- ["ganglia-node:juju-info", "namenode:juju-info"]
- ["ganglia-node:juju-info", "resourcemanager:juju-info"]
- ["ganglia-node:juju-info", "slave:juju-info"]
diff --git a/bigtop-deploy/juju/hadoop-spark/bundle.yaml b/bigtop-deploy/juju/hadoop-spark/bundle.yaml
index a01d2d8..410bc42 100644
--- a/bigtop-deploy/juju/hadoop-spark/bundle.yaml
+++ b/bigtop-deploy/juju/hadoop-spark/bundle.yaml
@@ -1,6 +1,6 @@
series: xenial
description: >
- This is a nine unit big data cluster that includes Hadoop 2.7 and Spark 2.1
+ This is an eight unit big data cluster that includes Hadoop 2.7 and Spark 2.1
from Apache Bigtop. Use it to analyse batch data with MapReduce or streaming
data with Spark. It will run on 5 machines in your cloud.
services:
@@ -38,15 +38,6 @@ services:
annotations:
gui-x: "1000"
gui-y: "400"
- client:
- charm: "cs:xenial/hadoop-client-12"
- constraints: "mem=7G root-disk=32G"
- num_units: 1
- annotations:
- gui-x: "1250"
- gui-y: "400"
- to:
- - "4"
spark:
charm: "cs:xenial/spark-71"
constraints: "mem=7G root-disk=32G"
@@ -91,7 +82,6 @@ relations:
- [plugin, namenode]
- [plugin, resourcemanager]
- [spark, plugin]
- - [client, plugin]
- ["ganglia-node:juju-info", "namenode:juju-info"]
- ["ganglia-node:juju-info", "resourcemanager:juju-info"]
- ["ganglia-node:juju-info", "slave:juju-info"]
diff --git a/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py b/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py
index 1e9794f..42222cc 100755
--- a/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py
+++ b/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py
@@ -48,8 +48,7 @@ class TestBundle(unittest.TestCase):
cls.d.setup(timeout=3600)
# we need units reporting ready before we attempt our smoke tests
- cls.d.sentry.wait_for_messages({'client': re.compile('ready'),
- 'namenode': re.compile('ready'),
+ cls.d.sentry.wait_for_messages({'namenode': re.compile('ready'),
'resourcemanager': re.compile('ready'),
'slave': re.compile('ready'),
'spark': re.compile('ready'),