Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 56975200D5D for ; Wed, 6 Dec 2017 00:30:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 55303160C1C; Tue, 5 Dec 2017 23:30:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9AC89160C1B for ; Wed, 6 Dec 2017 00:30:04 +0100 (CET) Received: (qmail 95369 invoked by uid 500); 5 Dec 2017 23:30:03 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 95360 invoked by uid 99); 5 Dec 2017 23:30:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Dec 2017 23:30:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 96C8DE0219; Tue, 5 Dec 2017 23:30:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Message-Id: <7e661a8b8cfa42b89c72000b8c7f7bee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-19323 Make netty engine default in hbase2 Date: Tue, 5 Dec 2017 23:30:03 +0000 (UTC) archived-at: Tue, 05 Dec 2017 23:30:05 -0000 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 Authored: Tue Nov 21 20:16:55 2017 -0800 Committer: Michael Stack 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 services,