Merge lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/status-removed into lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/trunk

[Cory Johns]

Fixed status reporting not being accurate when relations were removed

[Kevin W Monroe (kwmonroe)]

LGTM

review: Approve

[lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/status-removed]

113. By Cory Johns on 2015-08-13

Added support for HDFS-only deployment

114. By Cory Johns on 2015-08-17

Bumped jujubigdata version to include required changes

[Kevin W Monroe (kwmonroe)]

Sneaking these additional commits in post-approval was sneaky. They LGTM and are merged in trunk now.

review: Approve

=== modified file 'hooks/callbacks.py'
--- hooks/callbacks.py	2015-06-25 15:41:48 +0000
+++ hooks/callbacks.py	2015-08-17 20:36:24 +0000
@@ -24,28 +24,28 @@
 def update_blocked_status():
     if unitdata.kv().get('charm.active', False):
         return
-    rels = (
-        ('Yarn', 'ResourceManager', ResourceManager()),
+    rels = [
         ('HDFS', 'NameNode', NameNode()),
-    )
+    ]
     missing_rel = [rel for rel, res, impl in rels if not impl.connected_units()]
-    missing_hosts = [rel for rel, res, impl in rels if not impl.am_i_registered()]
-    not_ready = [(rel, res) for rel, res, impl in rels if not impl.is_ready()]
+    rels.append(('Yarn', 'ResourceManager', ResourceManager()))
+    not_ready = [(rel, res) for rel, res, impl in rels if impl.connected_units() and not impl.is_ready()]
+    missing_hosts = [rel for rel, res, impl in rels if impl.connected_units() and not impl.am_i_registered()]
     if missing_rel:
         hookenv.status_set('blocked', 'Waiting for relation to %s master%s' % (
             ' and '.join(missing_rel),
             's' if len(missing_rel) > 1 else '',
         )),
-    elif missing_hosts:
-        hookenv.status_set('waiting', 'Waiting for /etc/hosts registration on %s' % (
-            ' and '.join(missing_hosts),
-        ))
     elif not_ready:
         unready_rels, unready_ress = zip(*not_ready)
         hookenv.status_set('waiting', 'Waiting for %s to provide %s' % (
             ' and '.join(unready_rels),
             ' and '.join(unready_ress),
         ))
+    elif missing_hosts:
+        hookenv.status_set('waiting', 'Waiting for /etc/hosts registration on %s' % (
+            ' and '.join(missing_hosts),
+        ))
 
 
 def update_working_status():
@@ -56,5 +56,18 @@
 
 
 def update_active_status():
-    unitdata.kv().set('charm.active', True)
-    hookenv.status_set('active', 'Ready')
+    hdfs_ready = NameNode().is_ready()
+    yarn_connected = ResourceManager().connected_units()
+    yarn_ready = ResourceManager().is_ready()
+    if hdfs_ready and (not yarn_connected or yarn_ready):
+        unitdata.kv().set('charm.active', True)
+        hookenv.status_set('active', 'Ready%s' % (
+            '' if yarn_ready else ' (HDFS only)'
+        ))
+    else:
+        clear_active_flag()
+        update_blocked_status()
+
+
+def clear_active_flag():
+    unitdata.kv().set('charm.active', False)

=== modified file 'hooks/common.py'
--- hooks/common.py	2015-08-06 18:28:14 +0000
+++ hooks/common.py	2015-08-17 20:36:24 +0000
@@ -80,26 +80,44 @@
             ],
         },
         {
-            'name': 'plugin',
+            'name': 'hdfs',
             'provides': [
                 jujubigdata.relations.HadoopPlugin(),
             ],
             'requires': [
                 hadoop.is_installed,
+                hdfs_relation,
+            ],
+            'callbacks': [
+                callbacks.update_working_status,
+                hdfs_relation.register_provided_hosts,
+                jujubigdata.utils.manage_etc_hosts,
+                hdfs.configure_client,
+                callbacks.update_active_status,
+            ],
+            'cleanup': [
+                callbacks.clear_active_flag,
+                callbacks.update_blocked_status,
+            ],
+        },
+        {
+            'name': 'yarn',
+            'provides': [],
+            'requires': [
+                hadoop.is_installed,
                 yarn_relation,
-                hdfs_relation,
             ],
             'callbacks': [
                 callbacks.update_working_status,
                 yarn_relation.register_provided_hosts,
-                hdfs_relation.register_provided_hosts,
                 jujubigdata.utils.manage_etc_hosts,
                 yarn.install_demo,
                 yarn.configure_client,
-                hdfs.configure_client,
                 callbacks.update_active_status,
             ],
-            'cleanup': [],
+            'cleanup': [
+                callbacks.update_blocked_status,
+            ],
         },
     ])
     manager.manage()

=== added file 'hooks/hadoop-plugin-relation-departed'
--- hooks/hadoop-plugin-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/hadoop-plugin-relation-departed	2015-08-17 20:36:24 +0000
@@ -0,0 +1,15 @@
+#!.venv/bin/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.
+
+import common
+common.manage()

=== added file 'hooks/namenode-relation-departed'
--- hooks/namenode-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/namenode-relation-departed	2015-08-17 20:36:24 +0000
@@ -0,0 +1,16 @@
+#!.venv/bin/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.
+
+import common
+
+common.manage()

=== added file 'hooks/resourcemanager-relation-departed'
--- hooks/resourcemanager-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/resourcemanager-relation-departed	2015-08-17 20:36:24 +0000
@@ -0,0 +1,16 @@
+#!.venv/bin/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.
+
+import common
+
+common.manage()

=== modified file 'resources.yaml'
--- resources.yaml	2015-08-06 19:49:46 +0000
+++ resources.yaml	2015-08-17 20:36:24 +0000
@@ -4,7 +4,7 @@
   pathlib:
     pypi: path.py>=7.0
   jujubigdata:
-    pypi: jujubigdata>=3.0.0,<4.0.0
+    pypi: jujubigdata>=4.0.0,<5.0.0
   charm-benchmark:
     pypi: charm-benchmark>=1.0.1,<2.0.0
   java-installer: