Merge lp:~bigdata-dev/charms/trusty/hdp-hive/cs-jps-quickfix into lp:charms/trusty/hdp-hive

[Cory Johns]

Work around the upstream JPS issue (https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/1417962)

[amir sanjar (asanjar)]

review: Approve

[lp:~bigdata-dev/charms/trusty/hdp-hive/cs-jps-quickfix]

16. By Kevin W Monroe on 2015-02-25

remove refs to personal branch in test yaml

[Matt Bruzek (mbruzek)]

I could not get the tests to run from my machine, but the code looks just like the others which looks good to me.

review: Approve

=== modified file 'hooks/bdutils.py'
--- hooks/bdutils.py	2014-08-15 13:20:52 +0000
+++ hooks/bdutils.py	2015-02-25 15:34:40 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+import re
 import os
 import pwd
 import grp
@@ -124,23 +125,25 @@
                 m = ll[0]+" = "+ll[1].strip().strip(';').strip("\"").strip()
                 #log ("==> {} ".format("\""+m+"\""))
                 os.environ[ll[0]] = ll[1].strip().strip(';').strip("\"").strip()
-                
+
+
+def jps(name):
+    """
+    Get PIDs for named Java processes, for any user.
+    """
+    pat = re.sub(r'^(.)', r'^[^ ]*java .*[\1]', name)
+    try:
+        output = subprocess.check_output(['sudo', 'pgrep', '-f', pat])
+    except subprocess.CalledProcessError:
+        return []
+    return map(int, filter(None, map(str.strip, output.split('\n'))))
+
+
 def is_jvm_service_active(processname):
-    cmd=["jps"]
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-    out, err = p.communicate()
-    if err == None and str(out).find(processname) != -1:
-        return True
-    else:
-        return False
+    return jps(processname) != []
+
 
 def kill_java_process(process):
-    cmd=["jps"]
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-    out, err = p.communicate()
-    cmd = out.split()
-    for i in range(0, len(cmd)):
-        if cmd[i] == process:
-            pid = int(cmd[i-1])
-            os.kill(pid, signal.SIGTERM)
+    for pid in jps(process):
+        os.kill(pid, signal.SIGTERM)
     return 0

=== modified file 'tests/hive-hadoop-sql-cluster.yaml'
--- tests/hive-hadoop-sql-cluster.yaml	2014-09-18 01:41:58 +0000
+++ tests/hive-hadoop-sql-cluster.yaml	2015-02-25 15:34:40 +0000
@@ -1,7 +1,7 @@
 hdp-hadoop-hive-mysql: 
   services: 
     "compute-node": 
-      charm: "cs:~asanjar/trusty/hdp-hadoop"
+      charm: "hdp-hadoop"
       num_units: 1
       annotations: 
         "gui-x": "768"
@@ -15,13 +15,13 @@
         "gui-x": "1102.9983551210835"
         "gui-y": "591.0585428804295"
     hdphive: 
-      charm: "cs:~asanjar/trusty/hdp-hive"
+      charm: "hdp-hive"
       num_units: 1
       annotations: 
         "gui-x": "1105.4991775605417"
         "gui-y": "284.9414571195705"
     "yarn-hdfs-master": 
-      charm: "cs:~asanjar/trusty/hdp-hadoop"
+      charm: "hdp-hadoop"
       num_units: 1
       annotations: 
         "gui-x": "769.0016448789165"