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 D9601200CA9 for ; Thu, 1 Jun 2017 09:47:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D6727160BB5; Thu, 1 Jun 2017 07:47:34 +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 34DFA160BC4 for ; Thu, 1 Jun 2017 09:47:34 +0200 (CEST) Received: (qmail 36559 invoked by uid 500); 1 Jun 2017 07:47:33 -0000 Mailing-List: contact commits-help@bookkeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bookkeeper-dev@bookkeeper.apache.org Delivered-To: mailing list commits@bookkeeper.apache.org Received: (qmail 36543 invoked by uid 99); 1 Jun 2017 07:47:33 -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; Thu, 01 Jun 2017 07:47:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1DE92DFEF5; Thu, 1 Jun 2017 07:47:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eolivelli@apache.org To: commits@bookkeeper.apache.org Message-Id: <4e10f842e7074018a4613e4e147bc969@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: bookkeeper git commit: BOOKKEEPER-1071: Use per connection instances of request encoder/decoder Date: Thu, 1 Jun 2017 07:47:33 +0000 (UTC) archived-at: Thu, 01 Jun 2017 07:47:35 -0000 Repository: bookkeeper Updated Branches: refs/heads/master fc51f73cb -> da7064871 BOOKKEEPER-1071: Use per connection instances of request encoder/decoder Author: Matteo Merli Reviewers: Enrico Olivelli, Sijie Guo Closes #170 from merlimat/bk-1071 Project: http://git-wip-us.apache.org/repos/asf/bookkeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/bookkeeper/commit/da706487 Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/da706487 Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/da706487 Branch: refs/heads/master Commit: da70648719679fd1db001c74ad873bf134f16198 Parents: fc51f73 Author: Matteo Merli Authored: Thu Jun 1 09:47:28 2017 +0200 Committer: Enrico Olivelli Committed: Thu Jun 1 09:47:28 2017 +0200 ---------------------------------------------------------------------- .../bookkeeper/proto/BookieNettyServer.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/da706487/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java ---------------------------------------------------------------------- diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java index cf7d419..53fd334 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java @@ -91,20 +91,14 @@ class BookieNettyServer { final BookieSocketAddress bookieAddress; final BookieAuthProvider.Factory authProviderFactory; - final BookieProtoEncoding.ResponseEncoder responseEncoder; - final BookieProtoEncoding.RequestDecoder requestDecoder; + final ExtensionRegistry registry = ExtensionRegistry.newInstance(); BookieNettyServer(ServerConfiguration conf, RequestProcessor processor) throws IOException, KeeperException, InterruptedException, BookieException { this.maxFrameSize = conf.getNettyMaxFrameSizeBytes(); this.conf = conf; this.requestProcessor = processor; - - ExtensionRegistry registry = ExtensionRegistry.newInstance(); - authProviderFactory = AuthProviderFactoryFactory.newBookieAuthProviderFactory(conf); - - responseEncoder = new BookieProtoEncoding.ResponseEncoder(registry); - requestDecoder = new BookieProtoEncoding.RequestDecoder(registry); + this.authProviderFactory = AuthProviderFactoryFactory.newBookieAuthProviderFactory(conf); if (!conf.isDisableServerSocketBind()) { ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("bookie-io-%s").build(); @@ -212,8 +206,8 @@ class BookieNettyServer { pipeline.addLast("lengthbaseddecoder", new LengthFieldBasedFrameDecoder(maxFrameSize, 0, 4, 0, 4)); pipeline.addLast("lengthprepender", new LengthFieldPrepender(4)); - pipeline.addLast("bookieProtoDecoder", requestDecoder); - pipeline.addLast("bookieProtoEncoder", responseEncoder); + pipeline.addLast("bookieProtoDecoder", new BookieProtoEncoding.RequestDecoder(registry)); + pipeline.addLast("bookieProtoEncoder", new BookieProtoEncoding.ResponseEncoder(registry)); pipeline.addLast("bookieAuthHandler", new AuthHandler.ServerSideHandler(contextHandler.getConnectionPeer(), authProviderFactory)); ChannelInboundHandler requestHandler = isRunning.get() @@ -261,8 +255,8 @@ class BookieNettyServer { pipeline.addLast("lengthbaseddecoder", new LengthFieldBasedFrameDecoder(maxFrameSize, 0, 4, 0, 4)); pipeline.addLast("lengthprepender", new LengthFieldPrepender(4)); - pipeline.addLast("bookieProtoDecoder", requestDecoder); - pipeline.addLast("bookieProtoEncoder", responseEncoder); + pipeline.addLast("bookieProtoDecoder", new BookieProtoEncoding.RequestDecoder(registry)); + pipeline.addLast("bookieProtoEncoder", new BookieProtoEncoding.ResponseEncoder(registry));; pipeline.addLast("bookieAuthHandler", new AuthHandler.ServerSideHandler(contextHandler.getConnectionPeer(), authProviderFactory)); ChannelInboundHandler requestHandler = isRunning.get()