PHOENIX-2996 Process name of PQS should indicate its role (Ted Yu)

apache · Oct 24, 2016 · a5bcb3e · a5bcb3e
1 parent 6cf827a
commit a5bcb3e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 deletions.
diff --git a/bin/queryserver.py b/bin/queryserver.py
@@ -128,7 +128,7 @@
     " -Dpsql.log.dir=%(log_dir)s" + \
     " -Dpsql.log.file=%(log_file)s" + \
     " " + opts + \
-    " org.apache.phoenix.queryserver.server.Main " + args
+    " org.apache.phoenix.queryserver.server.QueryServer " + args
 
 if command == 'makeWinServiceDesc':
     cmd = java_cmd % {'java': java, 'root_logger': 'INFO,DRFA,console', 'log_dir': log_dir, 'log_file': phoenix_log_file}

diff --git a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
@@ -66,8 +66,8 @@ public static void beforeClass() throws Exception {
     AVATICA_SERVER = new QueryServerThread(new String[] { url }, CONF,
             QueryServerBasicsIT.class.getName());
     AVATICA_SERVER.start();
-    AVATICA_SERVER.getMain().awaitRunning();
+    AVATICA_SERVER.getQueryServer().awaitRunning();
-    final int port = AVATICA_SERVER.getMain().getPort();
+    final int port = AVATICA_SERVER.getQueryServer().getPort();
     LOG.info("Avatica server started on port " + port);
     CONN_STRING = ThinClientUtil.getConnectionUrl("localhost", port);
     LOG.info("JDBC connection string is " + CONN_STRING);
@@ -77,11 +77,12 @@ public static void beforeClass() throws Exception {
   public static void afterClass() throws Exception {
     if (AVATICA_SERVER != null) {
       AVATICA_SERVER.join(TimeUnit.MINUTES.toMillis(1));
-      Throwable t = AVATICA_SERVER.getMain().getThrowable();
+      Throwable t = AVATICA_SERVER.getQueryServer().getThrowable();
       if (t != null) {
         fail("query server threw. " + t.getMessage());
       }
-      assertEquals("query server didn't exit cleanly", 0, AVATICA_SERVER.getMain().getRetCode());
+      assertEquals("query server didn't exit cleanly", 0, AVATICA_SERVER.getQueryServer()
+        .getRetCode());
     }
   }
 

diff --git a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerThread.java b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerThread.java
@@ -18,28 +18,28 @@
 package org.apache.phoenix.end2end;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.phoenix.queryserver.server.Main;
+import org.apache.phoenix.queryserver.server.QueryServer;
 
 /** Wraps up the query server for tests. */
 public class QueryServerThread extends Thread {
 
-  private final Main main;
+  private final QueryServer main;
 
   public QueryServerThread(String[] argv, Configuration conf) {
     this(argv, conf, null);
   }
 
   public QueryServerThread(String[] argv, Configuration conf, String name) {
-    this(new Main(argv, conf), name);
+    this(new QueryServer(argv, conf), name);
   }
 
-  private QueryServerThread(Main m, String name) {
+  private QueryServerThread(QueryServer m, String name) {
     super(m, "query server" + (name == null ? "" : (" - " + name)));
     this.main = m;
     setDaemon(true);
   }
 
-  public Main getMain() {
+  public QueryServer getQueryServer() {
     return main;
   }
 }
diff --git a/...ache/phoenix/queryserver/server/Main.java → ...oenix/queryserver/server/QueryServer.java b/...ache/phoenix/queryserver/server/Main.java → ...oenix/queryserver/server/QueryServer.java
@@ -60,9 +60,9 @@
 /**
  * A query server for Phoenix over Calcite's Avatica.
  */
-public final class Main extends Configured implements Tool, Runnable {
+public final class QueryServer extends Configured implements Tool, Runnable {
 
-  protected static final Log LOG = LogFactory.getLog(Main.class);
+  protected static final Log LOG = LogFactory.getLog(QueryServer.class);
 
   private final String[] argv;
   private final CountDownLatch runningLatch = new CountDownLatch(1);
@@ -94,9 +94,11 @@ public static void logJVMInfo() {
   public static void logProcessInfo(Configuration conf) {
     // log environment variables unless asked not to
     if (conf == null || !conf.getBoolean(QueryServices.QUERY_SERVER_ENV_LOGGING_ATTRIB, false)) {
-      Set<String> skipWords = new HashSet<String>(QueryServicesOptions.DEFAULT_QUERY_SERVER_SKIP_WORDS);
+      Set<String> skipWords = new HashSet<String>(
+          QueryServicesOptions.DEFAULT_QUERY_SERVER_SKIP_WORDS);
       if (conf != null) {
-        String[] confSkipWords = conf.getStrings(QueryServices.QUERY_SERVER_ENV_LOGGING_SKIPWORDS_ATTRIB);
+        String[] confSkipWords = conf.getStrings(
+            QueryServices.QUERY_SERVER_ENV_LOGGING_SKIPWORDS_ATTRIB);
         if (confSkipWords != null) {
           skipWords.addAll(Arrays.asList(confSkipWords));
         }
@@ -119,12 +121,12 @@ public static void logProcessInfo(Configuration conf) {
   }
 
   /** Constructor for use from {@link org.apache.hadoop.util.ToolRunner}. */
-  public Main() {
+  public QueryServer() {
     this(null, null);
   }
 
   /** Constructor for use as {@link java.lang.Runnable}. */
-  public Main(String[] argv, Configuration conf) {
+  public QueryServer(String[] argv, Configuration conf) {
     this.argv = argv;
     setConf(conf);
   }
@@ -168,24 +170,28 @@ public void awaitRunning(long timeout, TimeUnit unit) throws InterruptedExceptio
   public int run(String[] args) throws Exception {
     logProcessInfo(getConf());
     try {
-      final boolean isKerberos = "kerberos".equalsIgnoreCase(getConf().get(QueryServices.QUERY_SERVER_HBASE_SECURITY_CONF_ATTRIB));
+      final boolean isKerberos = "kerberos".equalsIgnoreCase(getConf().get(
+          QueryServices.QUERY_SERVER_HBASE_SECURITY_CONF_ATTRIB));
 
       // handle secure cluster credentials
       if (isKerberos) {
         String hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
             getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, "default"),
             getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, "default")));
         if (LOG.isDebugEnabled()) {
-          LOG.debug("Login to " + hostname + " using " + getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB)
+          LOG.debug("Login to " + hostname + " using " + getConf().get(
-              + " and principal " + getConf().get(QueryServices.QUERY_SERVER_KERBEROS_PRINCIPAL_ATTRIB) + ".");
+              QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB)
+              + " and principal " + getConf().get(
+                  QueryServices.QUERY_SERVER_KERBEROS_PRINCIPAL_ATTRIB) + ".");
         }
         SecurityUtil.login(getConf(), QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB,
             QueryServices.QUERY_SERVER_KERBEROS_PRINCIPAL_ATTRIB, hostname);
         LOG.info("Login successful.");
       }
 
       Class<? extends PhoenixMetaFactory> factoryClass = getConf().getClass(
-          QueryServices.QUERY_SERVER_META_FACTORY_ATTRIB, PhoenixMetaFactoryImpl.class, PhoenixMetaFactory.class);
+          QueryServices.QUERY_SERVER_META_FACTORY_ATTRIB, PhoenixMetaFactoryImpl.class,
+          PhoenixMetaFactory.class);
       int port = getConf().getInt(QueryServices.QUERY_SERVER_HTTP_PORT_ATTRIB,
           QueryServicesOptions.DEFAULT_QUERY_SERVER_HTTP_PORT);
       LOG.debug("Listening on port " + port);
@@ -277,7 +283,8 @@ public PhoenixDoAsCallback(UserGroupInformation serverUgi, Configuration conf) {
     }
 
     @Override
-    public <T> T doAsRemoteUser(String remoteUserName, String remoteAddress, final Callable<T> action) throws Exception {
+    public <T> T doAsRemoteUser(String remoteUserName, String remoteAddress,
+        final Callable<T> action) throws Exception {
       // We are guaranteed by Avatica that the `remoteUserName` is properly authenticated by the
       // time this method is called. We don't have to verify the wire credentials, we can assume the
       // user provided valid credentials for who it claimed it was.
@@ -327,7 +334,7 @@ public UserGroupInformation load(String remoteUserName) throws Exception {
   }
 
   public static void main(String[] argv) throws Exception {
-    int ret = ToolRunner.run(HBaseConfiguration.create(), new Main(), argv);
+    int ret = ToolRunner.run(HBaseConfiguration.create(), new QueryServer(), argv);
     System.exit(ret);
   }
 }
diff --git a/...ryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixDoAsCallbackTest.java b/...ryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixDoAsCallbackTest.java
@@ -25,7 +25,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authorize.ProxyUsers;
-import org.apache.phoenix.queryserver.server.Main.PhoenixDoAsCallback;
+import org.apache.phoenix.queryserver.server.QueryServer.PhoenixDoAsCallback;
 import org.junit.Test;
 
 /**