Merge lp:~bigdata-dev/charms/trusty/hdp-zookeeper/trunk into lp:charms/trusty/hdp-zookeeper

[amir sanjar]

adding single node support - having single node zookeeper is NOT RECOMMENDED for production

[Charles Butler (lazypower)]

Greetings Amir,

While this is a nice addition to the zookeeper charm, supporting single node deployment - it doesn't appear there was a test added to validate this configuration, nor was the readme updated to reflect the option of a single node deployment.

If you could get those added I'd be more than happy to re-review this branch for inclusion in the upstream charm.

review: Needs Fixing

[lp:~bigdata-dev/charms/trusty/hdp-zookeeper/trunk]

21. By amir sanjar on 2014-12-08

merging code review suggestion

[Charles Butler (lazypower)]

+1 LGTM

Thanks for the fixes

review: Approve

=== modified file 'README.md'
--- README.md	2014-09-09 02:07:17 +0000
+++ README.md	2014-12-08 20:19:18 +0000
@@ -13,6 +13,11 @@
 To learn more about ZooKeeper visit the upstream [docs](http://docs.hortonworks.com/HDPDocuments/HDP2/HDP-2.1.3/bk_installing_manually_book/content/rpm-zookeeper.html)
 
 # Deployment Strategy
+
+Instruction to create a zookeeper node :
+
+    juju deploy hdp-zookeeper hdp-zookeeper
+
  
 Step by step instructions to create a zookeeper quorum :
 
 
=== removed file 'bundles.yaml'
--- bundles.yaml	2014-08-27 17:02:39 +0000
+++ bundles.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-hdp-zookeeper-quorum: 
-  services: 
-    "hdp-zookeeper": 
-      charm: "cs:~asanjar/trusty/hdp-zookeeper"
-      num_units: 3
-      annotations: 
-        "gui-x": "1201.0940759645143"
-        "gui-y": "462.5"
-  relations: []
-  series: trusty
 
=== modified file 'config.yaml'
--- config.yaml	2014-08-02 02:02:26 +0000
+++ config.yaml	2014-12-08 20:19:18 +0000
@@ -3,3 +3,8 @@
     type: string
     default: "/grid/hadoop/zookeeper/data"
     description: "Directory where ZooKeeper will store data." 
+ zk-port:
+    type: int
+    default: 2181
+    description: ZooKeeper Client Access Port
+
 
=== modified file 'hooks/bdutils.py'
--- hooks/bdutils.py	2014-08-02 02:02:26 +0000
+++ hooks/bdutils.py	2014-12-08 20:19:18 +0000
@@ -58,14 +58,17 @@
         f.writelines(contents)
 
 def fileRemoveKey(filePath, key):
-    log ("===> fileRemoveK ({}, {})".format(filePath, key))
+    log ("===> fileRemoveKey ({}, {})".format(filePath, key))
     found = False
+    print key
     with open(filePath) as f:
         contents = f.readlines()
+        print contents
         for l in range(0, len(contents)):
             if contents[l].startswith(key):
                 contents.pop(l)
                 found = True
+                break
     if found:
         with open(filePath, 'wb') as f:
             f.writelines(contents)
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-10-23 00:40:20 +0000
+++ hooks/hooks.py	2014-12-08 20:19:18 +0000
@@ -9,7 +9,7 @@
 from hdputils import install_base_pkg, updateHDPDirectoryScript, config_all_nodes, setHadoopEnvVar, home, hdpScript 
 from bdutils import setDirPermission, fileSetKV, fileRemoveKey
 from charmhelpers.lib.utils import config_get
-from charmhelpers.core.hookenv import log, Hooks, relation_get, open_port, related_units, local_unit, unit_get
+from charmhelpers.core.hookenv import log, Hooks, relation_get, open_port, related_units, local_unit, unit_get, relation_set
 from charmhelpers.core.host import add_user_to_group
 
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
@@ -79,6 +79,8 @@
         df.writelines(getid(local_unit()))
     zkhost = unit_get('private-address')
     fileSetKV(zoocfg, "dataDir=", data_path)
+    # cleaning up zookeeper config
+    fileRemoveKey(zoocfg, "server.1=")
     fileSetKV(zoocfg, "server"+"."+getid(local_unit())+"=", zkhost+":2888:3888")
     setZKConf()
     
@@ -98,12 +100,10 @@
     packages =['ntp', 'openjdk-7-jdk',"zookeeper"]
     install_base_pkg(packages)
     config_zk_nodes()
-    fileSetKV(zoocfg, "server"+"."+getid(local_unit())+"=", unit_get('private-address')+":2888:3888")
-    open_port(2181)
+    open_port(config_get('zk-port'))
     open_port(2888)
     open_port(3888)
     
-    log('Installing hdp-zookeeper')
 
 
 @hooks.hook('config-changed')
@@ -152,6 +152,7 @@
 @hooks.hook('zookeeper-relation-joined')
 def zookeeper_relation_joined():
     log('==> zookeeper_relation_joined')
+    relation_set(port=config_get('zk-port'))
     
 if __name__ == "__main__":
     # execute a hook based on the name the program is called by
 
=== modified file 'tests/10-deploy'
--- tests/10-deploy	2014-08-27 23:52:36 +0000
+++ tests/10-deploy	2014-12-08 20:19:18 +0000
@@ -8,7 +8,7 @@
 class TestDeployment(object):
     def __init__(self):
         self.d =  amulet.Deployment(series='trusty')
-        f = open('bundles.yaml')
+        f = open(os.path.join(os.path.dirname(__file__), 'bundles.yaml'))
         bun = f.read()
         self.d.load(yaml.safe_load(bun))
         #self.d.add('hdp-zookeeper', charm='~/development/charms/trusty/hdp-zookeeper', units=3)
@@ -50,4 +50,4 @@
                     
 if __name__ == '__main__':
     runner = TestDeployment()
-    runner.run() 
 \ No newline at end of file
+    runner.run() 
 
=== added file 'tests/bundles.yaml'
--- tests/bundles.yaml	1970-01-01 00:00:00 +0000
+++ tests/bundles.yaml	2014-12-08 20:19:18 +0000
@@ -0,0 +1,10 @@
+hdp-zookeeper-quorum: 
+  services: 
+    "hdp-zookeeper": 
+      charm: "cs:~asanjar/trusty/hdp-zookeeper"
+      num_units: 3
+      annotations: 
+        "gui-x": "1201.0940759645143"
+        "gui-y": "462.5"
+  relations: []
+  series: trusty