Merge lp:~lazypower/charms/trusty/hdp-zookeeper/refactor_socket into lp:charms/trusty/hdp-zookeeper

[Charles Butler]

Refactors out the use of socket to fetch hostname/ip addressing and cleans up a few idempotency issues with the charm

[amir sanjar (asanjar)]

+1

[amir sanjar (asanjar)]

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-08-26 18:59:35 +0000
+++ hooks/hooks.py	2014-10-23 14:13:37 +0000
@@ -8,9 +8,8 @@
 
 from hdputils import install_base_pkg, updateHDPDirectoryScript, config_all_nodes, setHadoopEnvVar, home, hdpScript 
 from bdutils import setDirPermission, fileSetKV, fileRemoveKey
-from socket import gethostname, gethostbyaddr
 from charmhelpers.lib.utils import config_get
-from charmhelpers.core.hookenv import log, Hooks, relation_get, open_port, related_units, local_unit
+from charmhelpers.core.hookenv import log, Hooks, relation_get, open_port, related_units, local_unit, unit_get
 from charmhelpers.core.host import add_user_to_group
 
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
@@ -19,9 +18,9 @@
 def setZKConf():
     log("==> setZKConf","INFO") 
     zkconfdir = os.environ['ZOOKEEPER_CONF_DIR']
-    if os.path.isdir(zkconfdir):
+    if os.path.islink(zkconfdir):
         os.unlink(zkconfdir)
-    os.makedirs( zkconfdir)
+        os.makedirs( zkconfdir)
     source = os.listdir(ZKConfPath)
 
     for files in source:
@@ -65,7 +64,7 @@
     cmd = "usermod zookeeper -s /bin/bash"
     subprocess.call(cmd.split())
     cmd ='groupadd '+os.environ['HADOOP_GROUP']
-    subprocess.check_call(cmd.split())
+    subprocess.call(cmd.split())
     add_user_to_group(os.environ['ZOOKEEPER_USER'], os.environ['HADOOP_GROUP'])
     log_path = os.environ['ZOOKEEPER_LOG_DIR']
     pid_path = os.environ['ZOOKEEPER_PID_DIR']
@@ -78,7 +77,7 @@
     setDirPermission(data_path, owner, group, 0755)
     with open(myid, 'w+') as df:
         df.writelines(getid(local_unit()))
-    zkhost = gethostname()
+    zkhost = unit_get('private-address')
     fileSetKV(zoocfg, "dataDir=", data_path)
     fileSetKV(zoocfg, "server"+"."+getid(local_unit())+"=", zkhost+":2888:3888")
     setZKConf()
@@ -99,7 +98,7 @@
     packages =['ntp', 'openjdk-7-jdk',"zookeeper"]
     install_base_pkg(packages)
     config_zk_nodes()
-    fileSetKV(zoocfg, "server"+"."+getid(local_unit())+"=", gethostname()+":2888:3888")
+    fileSetKV(zoocfg, "server"+"."+getid(local_unit())+"=", unit_get('private-address')+":2888:3888")
     open_port(2181)
     open_port(2888)
     open_port(3888)
@@ -137,7 +136,7 @@
     for n in nodeList:
         unitIP = relation_get('private-address', unit=n)
         zk = os.path.join(os.path.sep, os.environ['ZOOKEEPER_CONF_DIR'], 'zoo.cfg')
-        fileSetKV(zk, "server."+getid(n)+"=", gethostbyaddr(unitIP)[0]+":2888:3888")
+        fileSetKV(zk, "server."+getid(n)+"=", unitIP +":2888:3888")
     restartZK()
     
 @hooks.hook('quorum-relation-departed')