Merge lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk into lp:charms/trusty/apache-hadoop-hdfs-secondary

Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 68
Proposed branch: lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk
Merge into: lp:charms/trusty/apache-hadoop-hdfs-secondary
Diff against target: 181 lines (+47/-46) (has conflicts)
7 files modified
DEV-README.md (+7/-0)
README.md (+7/-5)
dist.yaml (+0/-40)
hooks/callbacks.py (+4/-0)
hooks/common.py (+2/-0)
hooks/secondary-relation-departed (+26/-0)
resources.yaml (+1/-1)
Text conflict in DEV-README.md
Conflict adding file resources/python/jujuresources-0.2.9.tar.gz.  Moved existing file to resources/python/jujuresources-0.2.9.tar.gz.moved.
To merge this branch: bzr merge lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+268669@code.launchpad.net
To post a comment you must log in.
78. By Cory Johns

Fixed permissions on test_dist_config.py

Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

Realtime syslog analytics bundle test looked good. Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DEV-README.md'
2--- DEV-README.md 2015-06-18 17:08:57 +0000
3+++ DEV-README.md 2015-08-21 21:51:30 +0000
4@@ -31,10 +31,17 @@
5
6 ## Manual Deployment
7
8+<<<<<<< TREE
9 The easiest way to deploy the core Apache Hadoop platform is to use one of
10 the [apache bundles](https://jujucharms.com/u/bigdata-charmers/#bundles).
11 However, to manually deploy the base Apache Hadoop platform without using one
12 of the bundles, you can use the following:
13+=======
14+The easiest way to deploy an Apache Hadoop platform is to use one of
15+the [apache bundles](https://jujucharms.com/u/bigdata-charmers/#bundles).
16+However, to manually deploy the base Apache Hadoop platform without using one
17+of the bundles, you can use the following:
18+>>>>>>> MERGE-SOURCE
19
20 juju deploy apache-hadoop-hdfs-master hdfs-master
21 juju deploy apache-hadoop-hdfs-secondary secondary-namenode
22
23=== modified file 'README.md'
24--- README.md 2015-06-18 17:08:57 +0000
25+++ README.md 2015-08-21 21:51:30 +0000
26@@ -51,17 +51,19 @@
27 of these resources:
28
29 sudo pip install jujuresources
30- juju resources fetch --all apache-hadoop-compute-slave/resources.yaml -d /tmp/resources
31- juju resources serve -d /tmp/resources
32+ juju-resources fetch --all /path/to/resources.yaml -d /tmp/resources
33+ juju-resources serve -d /tmp/resources
34
35 This will fetch all of the resources needed by this charm and serve them via a
36-simple HTTP server. You can then set the `resources_mirror` config option to
37-have the charm use this server for retrieving resources.
38+simple HTTP server. The output from `juju-resources serve` will give you a
39+URL that you can set as the `resources_mirror` config option for this charm.
40+Setting this option will cause all resources required by this charm to be
41+downloaded from the configured URL.
42
43 You can fetch the resources for all of the Apache Hadoop charms
44 (`apache-hadoop-hdfs-master`, `apache-hadoop-yarn-master`,
45 `apache-hadoop-hdfs-secondary`, `apache-hadoop-plugin`, etc) into a single
46-directory and serve them all with a single `juju resources serve` instance.
47+directory and serve them all with a single `juju-resources serve` instance.
48
49
50 ## Contact Information
51
52=== modified file 'dist.yaml'
53--- dist.yaml 2015-05-12 21:52:31 +0000
54+++ dist.yaml 2015-08-21 21:51:30 +0000
55@@ -73,50 +73,10 @@
56 # Only expose ports serving a UI or external API (i.e., namenode and
57 # resourcemanager). Communication among units within the cluster does
58 # not need ports to be explicitly opened.
59- # If adding a port here, you will need to update
60- # charmhelpers.contrib.bigdata.handlers.apache or hooks/callbacks.py
61- # to ensure that it is supported.
62- namenode:
63- port: 8020
64- exposed_on: 'hdfs-master'
65- nn_webapp_http:
66- port: 50070
67- exposed_on: 'hdfs-master'
68- dn_webapp_http:
69- port: 50075
70- exposed_on: 'compute-slave'
71 sn_webapp_http:
72 port: 50090
73 exposed_on: 'secondary-namenode'
74- resourcemanager:
75- port: 8032
76- exposed_on: 'yarn-master'
77- rm_webapp_http:
78- port: 8088
79- exposed_on: 'yarn-master'
80- rm_log:
81- port: 19888
82- nm_webapp_http:
83- port: 8042
84- exposed_on: 'compute-slave'
85- jobhistory:
86- port: 10020
87- jh_webapp_http:
88- port: 19888
89- exposed_on: 'yarn-master'
90 # TODO: support SSL
91- #nn_webapp_https:
92- # port: 50470
93- # exposed_on: 'hdfs-master'
94- #dn_webapp_https:
95- # port: 50475
96- # exposed_on: 'compute-slave'
97 #sn_webapp_https:
98 # port: 50091
99 # exposed_on: 'secondary-namenode'
100- #rm_webapp_https:
101- # port: 8090
102- # exposed_on: 'yarn-master'
103- #nm_webapp_https:
104- # port: 8044
105- # exposed_on: 'compute-slave'
106
107=== modified file 'hooks/callbacks.py'
108--- hooks/callbacks.py 2015-06-24 22:13:14 +0000
109+++ hooks/callbacks.py 2015-08-21 21:51:30 +0000
110@@ -40,3 +40,7 @@
111 def update_active_status():
112 unitdata.kv().set('charm.active', True)
113 hookenv.status_set('active', 'Ready')
114+
115+
116+def clear_active_flag():
117+ unitdata.kv().set('charm.active', False)
118
119=== modified file 'hooks/common.py'
120--- hooks/common.py 2015-06-24 22:13:14 +0000
121+++ hooks/common.py 2015-08-21 21:51:30 +0000
122@@ -88,8 +88,10 @@
123 callbacks.update_active_status,
124 ],
125 'cleanup': [
126+ callbacks.clear_active_flag,
127 charmframework.helpers.close_ports(dist_config.exposed_ports('secondary-namenode')),
128 hdfs.stop_secondarynamenode,
129+ callbacks.update_blocked_status,
130 ],
131 },
132 ])
133
134=== added file 'hooks/secondary-relation-departed'
135--- hooks/secondary-relation-departed 1970-01-01 00:00:00 +0000
136+++ hooks/secondary-relation-departed 2015-08-21 21:51:30 +0000
137@@ -0,0 +1,26 @@
138+#!/usr/bin/env python
139+# Licensed under the Apache License, Version 2.0 (the "License");
140+# you may not use this file except in compliance with the License.
141+# You may obtain a copy of the License at
142+#
143+# http://www.apache.org/licenses/LICENSE-2.0
144+#
145+# Unless required by applicable law or agreed to in writing, software
146+# distributed under the License is distributed on an "AS IS" BASIS,
147+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
148+# See the License for the specific language governing permissions and
149+# limitations under the License.
150+
151+"""
152+All hooks in this charm are managed by the Charm Framework.
153+The framework helps manage dependencies and preconditions to ensure that
154+steps are only executed when they can be successful. As such, no additional
155+code should be added to this hook; instead, please integrate new functionality
156+into the 'callbacks' list in hooks/common.py. New callbacks can be placed
157+in hooks/callbacks.py, if necessary.
158+
159+See http://big-data-charm-helpers.readthedocs.org/en/latest/examples/framework.html
160+for more information.
161+"""
162+import common
163+common.manage()
164
165=== modified file 'resources.yaml'
166--- resources.yaml 2015-07-24 15:24:39 +0000
167+++ resources.yaml 2015-08-21 21:51:30 +0000
168@@ -4,7 +4,7 @@
169 pathlib:
170 pypi: path.py>=7.0
171 jujubigdata:
172- pypi: jujubigdata>=2.0.2,<3.0.0
173+ pypi: jujubigdata>=4.0.0,<5.0.0
174 java-installer:
175 # This points to a script which manages installing Java.
176 # If replaced with an alternate implementation, it must output *only* two
177
178=== added file 'resources/python/jujuresources-0.2.9.tar.gz'
179Binary 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-21 21:51:30 +0000 differ
180=== renamed file 'resources/python/jujuresources-0.2.9.tar.gz' => 'resources/python/jujuresources-0.2.9.tar.gz.moved'
181=== modified file 'tests/remote/test_dist_config.py' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches