You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2016/08/30 22:49:35 UTC
[7/7] phoenix git commit: PHOENIX-3223 Add `hadoop classpath` to PQS
classpath when available
PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available
Closes apache/phoenix#205
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/93a9c918
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/93a9c918
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/93a9c918
Branch: refs/heads/master
Commit: 93a9c9187f63578b9da9864e06c0df3231c9f61c
Parents: ede483c
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 30 15:58:50 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 30 18:49:08 2016 -0400
----------------------------------------------------------------------
bin/queryserver.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/93a9c918/bin/queryserver.py
----------------------------------------------------------------------
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 1048adb..1ad8b86 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -73,6 +73,7 @@ else:
# 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 @@ out_file_path = os.path.join(log_dir, phoenix_out_file)
# 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" + \