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 2018/09/18 21:29:44 UTC
[1/4] phoenix git commit: PHOENIX-4892 Unable to start load balancer
with queryserver
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.2 8777983f9 -> 91576cdd5
refs/heads/4.x-HBase-1.3 7fa11ff62 -> e5379cd1d
refs/heads/4.x-HBase-1.4 7c91998d4 -> b55678229
refs/heads/master 9c8544e3f -> 91f085a90
PHOENIX-4892 Unable to start load balancer with queryserver
Added phoenix_loadbalancer_jar path to phoenix_utils.py,
added phoenix_loadbalancer_jar to classpath in queryserver.py,
added service for registry in meta-inf
Closes #343
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/91f085a9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/91f085a9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/91f085a9
Branch: refs/heads/master
Commit: 91f085a902357b0a589b6367fb9c5f40b9781c8f
Parents: 9c8544e
Author: Vitaliy <vi...@mail.ru>
Authored: Tue Sep 18 15:05:55 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 18 17:28:28 2018 -0400
----------------------------------------------------------------------
bin/phoenix_utils.py | 7 +++++++
bin/queryserver.py | 4 ++--
phoenix-load-balancer/pom.xml | 1 +
.../services/org.apache.phoenix.queryserver.register.Registry | 1 +
4 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/91f085a9/bin/phoenix_utils.py
----------------------------------------------------------------------
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index b521277..aa04a5b 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -71,6 +71,7 @@ def setPath():
PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client.jar"
PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar"
PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar"
+ PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar"
PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar"
PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*-minimal*.jar"
@@ -162,6 +163,11 @@ def setPath():
if phoenix_queryserver_jar == "":
phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, ".."))
+ global phoenix_loadbalancer_jar
+ phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*"))
+ if phoenix_loadbalancer_jar == "":
+ phoenix_loadbalancer_jar = findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, ".."))
+
global phoenix_traceserver_jar
phoenix_traceserver_jar = find(PHOENIX_TRACESERVER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-tracing-webapp", "target", "*"))
if phoenix_traceserver_jar == "":
@@ -218,5 +224,6 @@ if __name__ == "__main__":
print "hadoop_hdfs_jar:", hadoop_hdfs_jar
print "testjar:", testjar
print "phoenix_queryserver_jar:", phoenix_queryserver_jar
+ print "phoenix_loadbalancer_jar:", phoenix_loadbalancer_jar
print "phoenix_thin_client_jar:", phoenix_thin_client_jar
print "hadoop_classpath:", hadoop_classpath
http://git-wip-us.apache.org/repos/asf/phoenix/blob/91f085a9/bin/queryserver.py
----------------------------------------------------------------------
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 711bcc4..0c07b3b 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -120,8 +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 + \
- os.pathsep + hadoop_classpath + \
+ phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.phoenix_loadbalancer_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" + \
http://git-wip-us.apache.org/repos/asf/phoenix/blob/91f085a9/phoenix-load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml
index 4789c14..e29dffa 100644
--- a/phoenix-load-balancer/pom.xml
+++ b/phoenix-load-balancer/pom.xml
@@ -76,6 +76,7 @@
<configuration>
<excludes>
<exclude>src/main/resources/META-INF/services/org.apache.phoenix.loadbalancer.service.LoadBalanceZookeeperConf</exclude>
+ <exclude>src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/91f085a9/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
----------------------------------------------------------------------
diff --git a/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry b/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
new file mode 100644
index 0000000..05e1006
--- /dev/null
+++ b/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
@@ -0,0 +1 @@
+org.apache.phoenix.queryserver.register.ZookeeperRegistry
\ No newline at end of file
[3/4] phoenix git commit: PHOENIX-4892 Unable to start load balancer
with queryserver
Posted by el...@apache.org.
PHOENIX-4892 Unable to start load balancer with queryserver
Added phoenix_loadbalancer_jar path to phoenix_utils.py,
added phoenix_loadbalancer_jar to classpath in queryserver.py,
added service for registry in meta-inf
Closes #343
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b5567822
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b5567822
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b5567822
Branch: refs/heads/4.x-HBase-1.4
Commit: b556782299d452fd246e1b6c156613702a715537
Parents: 7c91998
Author: Vitaliy <vi...@mail.ru>
Authored: Tue Sep 18 15:05:55 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 18 17:28:56 2018 -0400
----------------------------------------------------------------------
bin/phoenix_utils.py | 7 +++++++
bin/queryserver.py | 4 ++--
phoenix-load-balancer/pom.xml | 1 +
.../services/org.apache.phoenix.queryserver.register.Registry | 1 +
4 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5567822/bin/phoenix_utils.py
----------------------------------------------------------------------
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index b521277..aa04a5b 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -71,6 +71,7 @@ def setPath():
PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client.jar"
PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar"
PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar"
+ PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar"
PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar"
PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*-minimal*.jar"
@@ -162,6 +163,11 @@ def setPath():
if phoenix_queryserver_jar == "":
phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, ".."))
+ global phoenix_loadbalancer_jar
+ phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*"))
+ if phoenix_loadbalancer_jar == "":
+ phoenix_loadbalancer_jar = findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, ".."))
+
global phoenix_traceserver_jar
phoenix_traceserver_jar = find(PHOENIX_TRACESERVER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-tracing-webapp", "target", "*"))
if phoenix_traceserver_jar == "":
@@ -218,5 +224,6 @@ if __name__ == "__main__":
print "hadoop_hdfs_jar:", hadoop_hdfs_jar
print "testjar:", testjar
print "phoenix_queryserver_jar:", phoenix_queryserver_jar
+ print "phoenix_loadbalancer_jar:", phoenix_loadbalancer_jar
print "phoenix_thin_client_jar:", phoenix_thin_client_jar
print "hadoop_classpath:", hadoop_classpath
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5567822/bin/queryserver.py
----------------------------------------------------------------------
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 711bcc4..0c07b3b 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -120,8 +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 + \
- os.pathsep + hadoop_classpath + \
+ phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.phoenix_loadbalancer_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" + \
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5567822/phoenix-load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml
index 388f66f..6d3ab04 100644
--- a/phoenix-load-balancer/pom.xml
+++ b/phoenix-load-balancer/pom.xml
@@ -75,6 +75,7 @@
<configuration>
<excludes>
<exclude>src/main/resources/META-INF/services/org.apache.phoenix.loadbalancer.service.LoadBalanceZookeeperConf</exclude>
+ <exclude>src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5567822/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
----------------------------------------------------------------------
diff --git a/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry b/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
new file mode 100644
index 0000000..05e1006
--- /dev/null
+++ b/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
@@ -0,0 +1 @@
+org.apache.phoenix.queryserver.register.ZookeeperRegistry
\ No newline at end of file
[2/4] phoenix git commit: PHOENIX-4892 Unable to start load balancer
with queryserver
Posted by el...@apache.org.
PHOENIX-4892 Unable to start load balancer with queryserver
Added phoenix_loadbalancer_jar path to phoenix_utils.py,
added phoenix_loadbalancer_jar to classpath in queryserver.py,
added service for registry in meta-inf
Closes #343
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e5379cd1
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e5379cd1
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e5379cd1
Branch: refs/heads/4.x-HBase-1.3
Commit: e5379cd1dc6b0ca40ed8a0524332acf75430b15f
Parents: 7fa11ff
Author: Vitaliy <vi...@mail.ru>
Authored: Tue Sep 18 15:05:55 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 18 17:28:42 2018 -0400
----------------------------------------------------------------------
bin/phoenix_utils.py | 7 +++++++
bin/queryserver.py | 4 ++--
phoenix-load-balancer/pom.xml | 1 +
.../services/org.apache.phoenix.queryserver.register.Registry | 1 +
4 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5379cd1/bin/phoenix_utils.py
----------------------------------------------------------------------
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index b521277..aa04a5b 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -71,6 +71,7 @@ def setPath():
PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client.jar"
PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar"
PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar"
+ PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar"
PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar"
PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*-minimal*.jar"
@@ -162,6 +163,11 @@ def setPath():
if phoenix_queryserver_jar == "":
phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, ".."))
+ global phoenix_loadbalancer_jar
+ phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*"))
+ if phoenix_loadbalancer_jar == "":
+ phoenix_loadbalancer_jar = findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, ".."))
+
global phoenix_traceserver_jar
phoenix_traceserver_jar = find(PHOENIX_TRACESERVER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-tracing-webapp", "target", "*"))
if phoenix_traceserver_jar == "":
@@ -218,5 +224,6 @@ if __name__ == "__main__":
print "hadoop_hdfs_jar:", hadoop_hdfs_jar
print "testjar:", testjar
print "phoenix_queryserver_jar:", phoenix_queryserver_jar
+ print "phoenix_loadbalancer_jar:", phoenix_loadbalancer_jar
print "phoenix_thin_client_jar:", phoenix_thin_client_jar
print "hadoop_classpath:", hadoop_classpath
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5379cd1/bin/queryserver.py
----------------------------------------------------------------------
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 711bcc4..0c07b3b 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -120,8 +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 + \
- os.pathsep + hadoop_classpath + \
+ phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.phoenix_loadbalancer_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" + \
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5379cd1/phoenix-load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml
index 7cffb58..48f7b03 100644
--- a/phoenix-load-balancer/pom.xml
+++ b/phoenix-load-balancer/pom.xml
@@ -75,6 +75,7 @@
<configuration>
<excludes>
<exclude>src/main/resources/META-INF/services/org.apache.phoenix.loadbalancer.service.LoadBalanceZookeeperConf</exclude>
+ <exclude>src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5379cd1/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
----------------------------------------------------------------------
diff --git a/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry b/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
new file mode 100644
index 0000000..05e1006
--- /dev/null
+++ b/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
@@ -0,0 +1 @@
+org.apache.phoenix.queryserver.register.ZookeeperRegistry
\ No newline at end of file
[4/4] phoenix git commit: PHOENIX-4892 Unable to start load balancer
with queryserver
Posted by el...@apache.org.
PHOENIX-4892 Unable to start load balancer with queryserver
Added phoenix_loadbalancer_jar path to phoenix_utils.py,
added phoenix_loadbalancer_jar to classpath in queryserver.py,
added service for registry in meta-inf
Closes #343
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/91576cdd
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/91576cdd
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/91576cdd
Branch: refs/heads/4.x-HBase-1.2
Commit: 91576cdd5778aa6f39a3b144765ece45e6eefe87
Parents: 8777983
Author: Vitaliy <vi...@mail.ru>
Authored: Tue Sep 18 15:05:55 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 18 17:29:07 2018 -0400
----------------------------------------------------------------------
bin/phoenix_utils.py | 7 +++++++
bin/queryserver.py | 4 ++--
phoenix-load-balancer/pom.xml | 1 +
.../services/org.apache.phoenix.queryserver.register.Registry | 1 +
4 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/91576cdd/bin/phoenix_utils.py
----------------------------------------------------------------------
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index b521277..aa04a5b 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -71,6 +71,7 @@ def setPath():
PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client.jar"
PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar"
PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar"
+ PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar"
PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar"
PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*-minimal*.jar"
@@ -162,6 +163,11 @@ def setPath():
if phoenix_queryserver_jar == "":
phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, ".."))
+ global phoenix_loadbalancer_jar
+ phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*"))
+ if phoenix_loadbalancer_jar == "":
+ phoenix_loadbalancer_jar = findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, ".."))
+
global phoenix_traceserver_jar
phoenix_traceserver_jar = find(PHOENIX_TRACESERVER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-tracing-webapp", "target", "*"))
if phoenix_traceserver_jar == "":
@@ -218,5 +224,6 @@ if __name__ == "__main__":
print "hadoop_hdfs_jar:", hadoop_hdfs_jar
print "testjar:", testjar
print "phoenix_queryserver_jar:", phoenix_queryserver_jar
+ print "phoenix_loadbalancer_jar:", phoenix_loadbalancer_jar
print "phoenix_thin_client_jar:", phoenix_thin_client_jar
print "hadoop_classpath:", hadoop_classpath
http://git-wip-us.apache.org/repos/asf/phoenix/blob/91576cdd/bin/queryserver.py
----------------------------------------------------------------------
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 711bcc4..0c07b3b 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -120,8 +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 + \
- os.pathsep + hadoop_classpath + \
+ phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.phoenix_loadbalancer_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" + \
http://git-wip-us.apache.org/repos/asf/phoenix/blob/91576cdd/phoenix-load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml
index 5d592e2..75aaeba 100644
--- a/phoenix-load-balancer/pom.xml
+++ b/phoenix-load-balancer/pom.xml
@@ -75,6 +75,7 @@
<configuration>
<excludes>
<exclude>src/main/resources/META-INF/services/org.apache.phoenix.loadbalancer.service.LoadBalanceZookeeperConf</exclude>
+ <exclude>src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/91576cdd/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
----------------------------------------------------------------------
diff --git a/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry b/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
new file mode 100644
index 0000000..05e1006
--- /dev/null
+++ b/phoenix-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
@@ -0,0 +1 @@
+org.apache.phoenix.queryserver.register.ZookeeperRegistry
\ No newline at end of file