BUG-37749: metadata start/stop scripts ask for JAVA_HOME even when java is path

src/bin/metadata_config.py

@@ -110,8 +110,9 @@ def executeEnvSh(confDir):
         proc.communicate()
 
 def java(classname, args, classpath, jvm_opts_list, logdir=None):
-    if os.environ.get("JAVA_HOME") is not None and os.environ["JAVA_HOME"]:
-        prg = os.path.join(os.environ["JAVA_HOME"], "bin", "java")
+    java_home = os.environ.get("JAVA_HOME", None)
+    if java_home:
+        prg = os.path.join(java_home, "bin", "java")
     else:
         prg = which("java")
 
@@ -124,8 +125,9 @@ def java(classname, args, classpath, jvm_opts_list, logdir=None):
     return runProcess(commandline, logdir)
 
 def jar(path):
-    if os.environ["JAVA_HOME"] is not None and os.environ["JAVA_HOME"]:
-        prg = os.path.join(os.environ["JAVA_HOME"], "bin", "jar")
+    java_home = os.environ.get("JAVA_HOME", None)
+    if java_home:
+        prg = os.path.join(java_home, "bin", "jar")
     else:
         prg = which("jar")
 

src/bin/metadata_start.py

@@ -17,6 +17,7 @@
 # limitations under the License.
 import os
 import sys
+import traceback
 
 import metadata_config as mc
 
@@ -74,6 +75,7 @@ if __name__ == '__main__':
         returncode = main()
     except Exception as e:
         print "Exception: %s " % str(e)
+        print traceback.format_exc()
         returncode = -1
 
     sys.exit(returncode)

src/bin/metadata_stop.py

@@ -18,6 +18,7 @@
 import os
 from signal import SIGTERM
 import sys
+import traceback
 
 import metadata_config as mc
 
@@ -52,6 +53,7 @@ if __name__ == '__main__':
         returncode = main()
     except Exception as e:
         print "Exception: %s " % str(e)
+        print traceback.format_exc()
         returncode = -1
 
     sys.exit(returncode)