From d65593b194f6bb89bc0e69e744d2c0e92971cdb8 Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Tue, 30 Aug 2016 15:58:50 -0400 Subject: [PATCH] PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available --- bin/queryserver.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/queryserver.py b/bin/queryserver.py index 1048adb8054..1ad8b865345 100755 --- a/bin/queryserver.py +++ b/bin/queryserver.py @@ -73,6 +73,7 @@ # HBase/Phoenix client side property override hbase_config_path = phoenix_utils.hbase_conf_dir hadoop_config_path = phoenix_utils.hadoop_conf +hadoop_classpath = phoenix_utils.hadoop_classpath # TODO: add windows support phoenix_file_basename = '%s-queryserver' % getpass.getuser() @@ -119,7 +120,8 @@ # The command is run through subprocess so environment variables are automatically inherited java_cmd = '%(java)s -cp ' + hbase_config_path + os.pathsep + hadoop_config_path + os.pathsep + \ - phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.phoenix_queryserver_jar + \ + phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.phoenix_queryserver_jar + \ + os.pathsep + hadoop_classpath + \ " -Dproc_phoenixserver" + \ " -Dlog4j.configuration=file:" + os.path.join(phoenix_utils.current_dir, "log4j.properties") + \ " -Dpsql.root.logger=%(root_logger)s" + \