Repository: phoenix Updated Branches: refs/heads/4.8-HBase-0.98 add1de676 -> 68988a84e refs/heads/4.8-HBase-1.0 8c2642c43 -> b1d3933a5 refs/heads/4.8-HBase-1.1 317780bb4 -> 990bb9d4f refs/heads/4.8-HBase-1.2 6655d5714 -> 008883a58 refs/heads/4.x-HBase-0.98 6ae65471d -> 68552306c refs/heads/4.x-HBase-1.1 5212931c5 -> 7a82c62ec refs/heads/master ede483cf2 -> 93a9c9187
PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7a82c62e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7a82c62e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7a82c62e Branch: refs/heads/4.x-HBase-1.1 Commit: 7a82c62ec264b03de85a73f61d0db1530249520b Parents: 5212931 Author: Josh Elser <[email protected]> Authored: Tue Aug 30 15:58:50 2016 -0400 Committer: Josh Elser <[email protected]> Committed: Tue Aug 30 18:47:05 2016 -0400 ---------------------------------------------------------------------- bin/queryserver.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a82c62e/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" + \
