bigdata-dev team mailing list archive
-
bigdata-dev team
-
Mailing list archive
-
Message #00215
[Merge] lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk into lp:charms/trusty/apache-hadoop-hdfs-secondary
Kevin W Monroe has proposed merging lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk into lp:charms/trusty/apache-hadoop-hdfs-secondary.
Requested reviews:
Kevin W Monroe (kwmonroe)
For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk/+merge/268669
--
Your team Juju Big Data Development is subscribed to branch lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk.
=== modified file 'DEV-README.md'
--- DEV-README.md 2015-06-18 17:08:57 +0000
+++ DEV-README.md 2015-08-20 23:12:01 +0000
@@ -31,10 +31,17 @@
## Manual Deployment
+<<<<<<< TREE
The easiest way to deploy the core Apache Hadoop platform is to use one of
the [apache bundles](https://jujucharms.com/u/bigdata-charmers/#bundles).
However, to manually deploy the base Apache Hadoop platform without using one
of the bundles, you can use the following:
+=======
+The easiest way to deploy an Apache Hadoop platform is to use one of
+the [apache bundles](https://jujucharms.com/u/bigdata-charmers/#bundles).
+However, to manually deploy the base Apache Hadoop platform without using one
+of the bundles, you can use the following:
+>>>>>>> MERGE-SOURCE
juju deploy apache-hadoop-hdfs-master hdfs-master
juju deploy apache-hadoop-hdfs-secondary secondary-namenode
=== modified file 'README.md'
--- README.md 2015-06-18 17:08:57 +0000
+++ README.md 2015-08-20 23:12:01 +0000
@@ -51,17 +51,19 @@
of these resources:
sudo pip install jujuresources
- juju resources fetch --all apache-hadoop-compute-slave/resources.yaml -d /tmp/resources
- juju resources serve -d /tmp/resources
+ juju-resources fetch --all /path/to/resources.yaml -d /tmp/resources
+ juju-resources serve -d /tmp/resources
This will fetch all of the resources needed by this charm and serve them via a
-simple HTTP server. You can then set the `resources_mirror` config option to
-have the charm use this server for retrieving resources.
+simple HTTP server. The output from `juju-resources serve` will give you a
+URL that you can set as the `resources_mirror` config option for this charm.
+Setting this option will cause all resources required by this charm to be
+downloaded from the configured URL.
You can fetch the resources for all of the Apache Hadoop charms
(`apache-hadoop-hdfs-master`, `apache-hadoop-yarn-master`,
`apache-hadoop-hdfs-secondary`, `apache-hadoop-plugin`, etc) into a single
-directory and serve them all with a single `juju resources serve` instance.
+directory and serve them all with a single `juju-resources serve` instance.
## Contact Information
=== modified file 'dist.yaml'
--- dist.yaml 2015-05-12 21:52:31 +0000
+++ dist.yaml 2015-08-20 23:12:01 +0000
@@ -73,50 +73,10 @@
# Only expose ports serving a UI or external API (i.e., namenode and
# resourcemanager). Communication among units within the cluster does
# not need ports to be explicitly opened.
- # If adding a port here, you will need to update
- # charmhelpers.contrib.bigdata.handlers.apache or hooks/callbacks.py
- # to ensure that it is supported.
- namenode:
- port: 8020
- exposed_on: 'hdfs-master'
- nn_webapp_http:
- port: 50070
- exposed_on: 'hdfs-master'
- dn_webapp_http:
- port: 50075
- exposed_on: 'compute-slave'
sn_webapp_http:
port: 50090
exposed_on: 'secondary-namenode'
- resourcemanager:
- port: 8032
- exposed_on: 'yarn-master'
- rm_webapp_http:
- port: 8088
- exposed_on: 'yarn-master'
- rm_log:
- port: 19888
- nm_webapp_http:
- port: 8042
- exposed_on: 'compute-slave'
- jobhistory:
- port: 10020
- jh_webapp_http:
- port: 19888
- exposed_on: 'yarn-master'
# TODO: support SSL
- #nn_webapp_https:
- # port: 50470
- # exposed_on: 'hdfs-master'
- #dn_webapp_https:
- # port: 50475
- # exposed_on: 'compute-slave'
#sn_webapp_https:
# port: 50091
# exposed_on: 'secondary-namenode'
- #rm_webapp_https:
- # port: 8090
- # exposed_on: 'yarn-master'
- #nm_webapp_https:
- # port: 8044
- # exposed_on: 'compute-slave'
=== modified file 'hooks/callbacks.py'
--- hooks/callbacks.py 2015-06-24 22:13:14 +0000
+++ hooks/callbacks.py 2015-08-20 23:12:01 +0000
@@ -40,3 +40,7 @@
def update_active_status():
unitdata.kv().set('charm.active', True)
hookenv.status_set('active', 'Ready')
+
+
+def clear_active_flag():
+ unitdata.kv().set('charm.active', False)
=== modified file 'hooks/common.py'
--- hooks/common.py 2015-06-24 22:13:14 +0000
+++ hooks/common.py 2015-08-20 23:12:01 +0000
@@ -88,8 +88,10 @@
callbacks.update_active_status,
],
'cleanup': [
+ callbacks.clear_active_flag,
charmframework.helpers.close_ports(dist_config.exposed_ports('secondary-namenode')),
hdfs.stop_secondarynamenode,
+ callbacks.update_blocked_status,
],
},
])
=== added file 'hooks/secondary-relation-departed'
--- hooks/secondary-relation-departed 1970-01-01 00:00:00 +0000
+++ hooks/secondary-relation-departed 2015-08-20 23:12:01 +0000
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+All hooks in this charm are managed by the Charm Framework.
+The framework helps manage dependencies and preconditions to ensure that
+steps are only executed when they can be successful. As such, no additional
+code should be added to this hook; instead, please integrate new functionality
+into the 'callbacks' list in hooks/common.py. New callbacks can be placed
+in hooks/callbacks.py, if necessary.
+
+See http://big-data-charm-helpers.readthedocs.org/en/latest/examples/framework.html
+for more information.
+"""
+import common
+common.manage()
=== modified file 'resources.yaml'
--- resources.yaml 2015-07-24 15:24:39 +0000
+++ resources.yaml 2015-08-20 23:12:01 +0000
@@ -4,7 +4,7 @@
pathlib:
pypi: path.py>=7.0
jujubigdata:
- pypi: jujubigdata>=2.0.2,<3.0.0
+ pypi: jujubigdata>=4.0.0,<5.0.0
java-installer:
# This points to a script which manages installing Java.
# If replaced with an alternate implementation, it must output *only* two
=== added file 'resources/python/jujuresources-0.2.9.tar.gz'
Binary files resources/python/jujuresources-0.2.9.tar.gz 1970-01-01 00:00:00 +0000 and resources/python/jujuresources-0.2.9.tar.gz 2015-08-20 23:12:01 +0000 differ
=== renamed file 'resources/python/jujuresources-0.2.9.tar.gz' => 'resources/python/jujuresources-0.2.9.tar.gz.moved'
Follow ups