bigdata-dev team mailing list archive

[Kevin W Monroe <kevin.monroe@xxxxxxxxxxxxx>]

Kevin W Monroe has proposed merging lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk into lp:charms/trusty/apache-hadoop-client.

Requested reviews:
  Kevin W Monroe (kwmonroe)

For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/trusty/apache-hadoop-client/trunk/+merge/268666
-- 
Your team Juju Big Data Development is subscribed to branch lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk.

=== modified file 'README.md'
--- README.md	2015-06-18 17:04:41 +0000
+++ README.md	2015-08-20 23:10:29 +0000
@@ -11,7 +11,11 @@
 ## Usage
 
 This charm is intended to be deployed as a part of the
+<<<<<<< TREE
 [core bundle](https://jujucharms.com/apache-core-batch-processing/):
+=======
+[core bundle](https://jujucharms.com/apache-core-batch-processing):
+>>>>>>> MERGE-SOURCE
 
     juju quickstart apache-core-batch-processing
 

=== modified file 'hooks/hadoop-plugin-relation-changed'
--- hooks/hadoop-plugin-relation-changed	2015-05-11 22:25:12 +0000
+++ hooks/hadoop-plugin-relation-changed	2015-08-20 23:10:29 +0000
@@ -1,4 +1,10 @@
 #!/bin/bash
-if [[ "$(relation-get hdfs-ready)" == "True" ]]; then
+hdfs_ready="$(relation-get hdfs-ready)"
+yarn_ready="$(relation-get yarn-ready)"
+if [[ "$hdfs_ready" == "true" && "$yarn_ready" == "true" ]]; then
     hooks/status-set active "Ready to run mapreduce jobs"
+elif [[ "$hdfs_ready" == "true" ]]; then
+    hooks/status-set active "Ready (HDFS only)"
+else
+    hooks/status-set waiting "Waiting for Hadoop to be ready"
 fi

=== 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-20 23:10:29 +0000
@@ -0,0 +1,2 @@
+#!/bin/bash
+hooks/status-set blocked "Please add relation to apache-hadoop-plugin"