From 97a4b7c5e6e94b8363b2eedb83062934bbb23794 Mon Sep 17 00:00:00 2001
From: Andrew Hulbert <andrew.hulbert@ccri.com>
Date: Tue, 23 Aug 2016 15:33:43 -0400
Subject: [PATCH 1/2] Added IP check compared to host name

---
 bin/cloud-local.sh    | 4 ++--
 conf/cloud-local.conf | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/cloud-local.sh b/bin/cloud-local.sh
index 879207b..f253d8a 100755
--- a/bin/cloud-local.sh
+++ b/bin/cloud-local.sh
@@ -132,8 +132,8 @@ function start_first_time {
   $KAFKA_HOME/bin/kafka-server-start.sh -daemon $KAFKA_HOME/config/server.properties
   
   # format namenode
-  echo "Formatting namenode..."
-  $HADOOP_HOME/bin/hadoop namenode -format
+  echo "Formatting namenode with config dir ${HADOOP_CONF_DIR}..."
+  $HADOOP_HOME/bin/hadoop --config $HADOOP_CONF_DIR namenode -format
   
   # start hadoop
   echo "Starting hadoop..."
diff --git a/conf/cloud-local.conf b/conf/cloud-local.conf
index b6633d3..88f4645 100644
--- a/conf/cloud-local.conf
+++ b/conf/cloud-local.conf
@@ -35,6 +35,14 @@ if [[ -z "${CL_BIND_ADDRESS}" ]]; then
   CL_BIND_ADDRESS="127.0.0.1"
 fi
 
+# compare the two
+resolved_ip=$(getent hosts $CL_HOSTNAME | awk '{print $1}')
+if [[ "${resolved_ip}" != "${CL_BIND_ADDRESS}" ]]; then
+  echo "!!! WARNING - Cloud Local bind hostname did not resolve to the same ip address as the cloud local bind address"
+  echo "!!! Check your /etc/hosts and DNS bindings"
+  exit
+fi
+
 if [[ -z "${CL_PORT_OFFSET}" ]]; then
   CL_PORT_OFFSET=0
 fi

From 6e1bed101e70de2f44badb1f085a752c347f1b70 Mon Sep 17 00:00:00 2001
From: Andrew Hulbert <andrew.hulbert@ccri.com>
Date: Wed, 24 Aug 2016 12:16:17 -0400
Subject: [PATCH 2/2] Force IPV4 for now

---
 conf/cloud-local.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/cloud-local.conf b/conf/cloud-local.conf
index 88f4645..2711268 100644
--- a/conf/cloud-local.conf
+++ b/conf/cloud-local.conf
@@ -32,11 +32,12 @@ if [[ -z "${CL_HOSTNAME}" ]]; then
 fi
 
 if [[ -z "${CL_BIND_ADDRESS}" ]]; then
+  # must be ipv4 for now
   CL_BIND_ADDRESS="127.0.0.1"
 fi
 
-# compare the two
-resolved_ip=$(getent hosts $CL_HOSTNAME | awk '{print $1}')
+# compare the two - ipv4 only at the moment
+resolved_ip=$(getent ahostsv4 ${CL_HOSTNAME} | head -n1 | awk '{print $1}')
 if [[ "${resolved_ip}" != "${CL_BIND_ADDRESS}" ]]; then
   echo "!!! WARNING - Cloud Local bind hostname did not resolve to the same ip address as the cloud local bind address"
   echo "!!! Check your /etc/hosts and DNS bindings"