hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-19323 Make netty engine default in hbase2
Date Tue, 05 Dec 2017 23:30:03 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 e051a4778 -> e048b2cbd


HBASE-19323 Make netty engine default in hbase2


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e048b2cb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e048b2cb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e048b2cb

Branch: refs/heads/branch-2
Commit: e048b2cbdb6586340b4bf855f1a1bd4963e33f3a
Parents: e051a47
Author: Michael Stack <stack@apache.org>
Authored: Tue Nov 21 20:16:55 2017 -0800
Committer: Michael Stack <stack@apache.org>
Committed: Tue Dec 5 15:29:57 2017 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/ipc/RpcServerFactory.java | 2 +-
 .../test/java/org/apache/hadoop/hbase/ipc/AbstractTestIPC.java  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e048b2cb/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerFactory.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerFactory.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerFactory.java
index 89d6601..649f1f1 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerFactory.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerFactory.java
@@ -48,7 +48,7 @@ public class RpcServerFactory {
       final InetSocketAddress bindAddress, Configuration conf,
       RpcScheduler scheduler) throws IOException {
     String rpcServerClass = conf.get(CUSTOM_RPC_SERVER_IMPL_CONF_KEY,
-        SimpleRpcServer.class.getName());
+        NettyRpcServer.class.getName());
     StringBuffer servicesList = new StringBuffer();
     for (BlockingServiceAndInterface s: services) {
       ServiceDescriptor sd = s.getBlockingService().getDescriptorForType();

http://git-wip-us.apache.org/repos/asf/hbase/blob/e048b2cb/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/AbstractTestIPC.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/AbstractTestIPC.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/AbstractTestIPC.java
index 6befe8f..90fb2f3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/AbstractTestIPC.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/AbstractTestIPC.java
@@ -59,6 +59,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.io.compress.GzipCodec;
 import org.apache.hadoop.util.StringUtils;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import org.apache.hadoop.hbase.shaded.com.google.common.collect.ImmutableList;
@@ -75,6 +76,10 @@ public abstract class AbstractTestIPC {
   private static final KeyValue CELL = new KeyValue(CELL_BYTES, CELL_BYTES, CELL_BYTES, CELL_BYTES);
 
   protected static final Configuration CONF = HBaseConfiguration.create();
+  static {
+    // Set the default to be the old SimpleRpcServer. Subclasses test it and netty.
+    CONF.set(RpcServerFactory.CUSTOM_RPC_SERVER_IMPL_CONF_KEY, SimpleRpcServer.class.getName());
+  }
 
   protected abstract RpcServer createRpcServer(final Server server, final String name,
       final List<BlockingServiceAndInterface> services,


Mime
View raw message