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 <els...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b8812269 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b8812269 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b8812269 Branch: refs/heads/4.x-cdh5.15 Commit: b881226919006ae6184275a2aefef078be735a94 Parents: 8208c0a Author: Vitaliy <vit34...@mail.ru> Authored: Tue Sep 18 20:05:55 2018 +0100 Committer: Pedro Boado <pbo...@apache.org> Committed: Wed Oct 17 22:49:38 2018 +0100 ---------------------------------------------------------------------- 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/b8812269/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/b8812269/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/b8812269/phoenix-load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml index 68ae9a8..a8319e9 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/b8812269/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
