From dev-return-78006-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Fri Feb 1 22:45:58 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 13C8918077F for ; Fri, 1 Feb 2019 23:45:56 +0100 (CET) Received: (qmail 64692 invoked by uid 500); 1 Feb 2019 22:45:55 -0000 Mailing-List: contact dev-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list dev@zookeeper.apache.org Received: (qmail 64557 invoked by uid 99); 1 Feb 2019 22:45:55 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2019 22:45:55 +0000 From: GitBox To: dev@zookeeper.apache.org Subject: [GitHub] ivmaykov commented on a change in pull request #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix Message-ID: <154906115463.19262.16231568633914133106.gitbox@gitbox.apache.org> Date: Fri, 01 Feb 2019 22:45:54 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit ivmaykov commented on a change in pull request #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix URL: https://github.com/apache/zookeeper/pull/753#discussion_r253221106 ########## File path: zookeeper-server/src/main/java/org/apache/zookeeper/server/NettyServerCnxn.java ########## @@ -303,19 +277,126 @@ private boolean checkFourLetterWord(final Channel channel, } } - public void receiveMessage(ChannelBuffer message) { + /** + * Process incoming message. This should only be called from the event + * loop thread. + * @param buf the message bytes to process. + */ + void processMessage(ByteBuf buf) { + assert channel.eventLoop().inEventLoop(); + if (LOG.isDebugEnabled()) { + LOG.debug("0x{} queuedBuffer: {}", + Long.toHexString(sessionId), + queuedBuffer); + } + + if (LOG.isTraceEnabled()) { + LOG.trace("0x{} buf {}", + Long.toHexString(sessionId), + ByteBufUtil.hexDump(buf)); + } + + if (throttled.get()) { + LOG.debug("Received message while throttled"); + // we are throttled, so we need to queue + if (queuedBuffer == null) { + LOG.debug("allocating queue"); + queuedBuffer = channel.alloc().buffer(buf.readableBytes()); + } + queuedBuffer.writeBytes(buf); + if (LOG.isTraceEnabled()) { + LOG.trace("0x{} queuedBuffer {}", + Long.toHexString(sessionId), + ByteBufUtil.hexDump(queuedBuffer)); + } + } else { + LOG.debug("not throttled"); + if (queuedBuffer != null) { + queuedBuffer.writeBytes(buf); + processQueuedBuffer(); + } else { + receiveMessage(buf); + // Have to check !closingChannel, because an error in + // receiveMessage() could have led to close() being called. + if (!closingChannel && buf.isReadable()) { + if (LOG.isTraceEnabled()) { + LOG.trace("Before copy {}", buf); + } + if (queuedBuffer == null) { + queuedBuffer = channel.alloc().buffer(buf.readableBytes()); + } + queuedBuffer.writeBytes(buf); + if (LOG.isTraceEnabled()) { + LOG.trace("Copy is {}", queuedBuffer); + LOG.trace("0x{} queuedBuffer {}", + Long.toHexString(sessionId), + ByteBufUtil.hexDump(queuedBuffer)); + } + } + } + } + } + + /** + * Try to process previously queued message. This should only be called + * from the event loop thread. + */ + void processQueuedBuffer() { + assert channel.eventLoop().inEventLoop(); Review comment: ``` if (!channel.eventLoop().inEventLoop()) { throw new IllegalStateException( "processQueuedBuffer() called from non-EventLoop thread"); } ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services