Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DFF23ED0E for ; Tue, 4 Dec 2012 17:28:04 +0000 (UTC) Received: (qmail 65365 invoked by uid 500); 4 Dec 2012 17:28:04 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 63382 invoked by uid 500); 4 Dec 2012 17:28:01 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 62888 invoked by uid 99); 4 Dec 2012 17:28:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 17:28:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 17:27:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DEC432388900; Tue, 4 Dec 2012 17:27:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1417046 - in /zookeeper/bookkeeper/trunk: ./ hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/ hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/ Date: Tue, 04 Dec 2012 17:27:36 -0000 To: commits@zookeeper.apache.org From: ivank@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121204172736.DEC432388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ivank Date: Tue Dec 4 17:27:35 2012 New Revision: 1417046 URL: http://svn.apache.org/viewvc?rev=1417046&view=rev Log: BOOKKEEPER-470: Possible infinite loop in simple.SubscribeReconnectCallback (sijie via ivank) Modified: zookeeper/bookkeeper/trunk/CHANGES.txt zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/ResubscribeCallback.java zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SubscribeReconnectCallback.java Modified: zookeeper/bookkeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1417046&r1=1417045&r2=1417046&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/CHANGES.txt (original) +++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue Dec 4 17:27:35 2012 @@ -146,6 +146,8 @@ Trunk (unreleased changes) BOOKKEEPER-454: hedwig c++ tester script assumes sh is bash (ivank) + BOOKKEEPER-470: Possible infinite loop in simple.SubscribeReconnectCallback (sijie via ivank) + hedwig-server: BOOKKEEPER-302: No more messages delivered when hub server scans messages over two ledgers. (sijie via ivank) Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/ResubscribeCallback.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/ResubscribeCallback.java?rev=1417046&r1=1417045&r2=1417046&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/ResubscribeCallback.java (original) +++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/ResubscribeCallback.java Tue Dec 4 17:27:35 2012 @@ -82,7 +82,11 @@ class ResubscribeCallback implements Cal // a topic subscription has failed. So instead, we'll just keep // retrying in the background until success. logger.error("Resubscribe failed with error: " + exception.getMessage()); - retrySubscribeRequest(); + // we don't retry subscribe request is channel manager is closing + // otherwise it might overflow the stack. + if (!channelManager.isClosed()) { + retrySubscribeRequest(); + } } private void retrySubscribeRequest() { Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SubscribeReconnectCallback.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SubscribeReconnectCallback.java?rev=1417046&r1=1417045&r2=1417046&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SubscribeReconnectCallback.java (original) +++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SubscribeReconnectCallback.java Tue Dec 4 17:27:35 2012 @@ -84,7 +84,11 @@ class SubscribeReconnectCallback impleme // a topic subscription has failed. So instead, we'll just keep // retrying in the background until success. logger.error("Subscribe reconnect failed with error: ", exception); - retrySubscribeRequest(); + // we don't retry subscribe request is channel manager is closing + // otherwise it might overflow the stack. + if (!channelManager.isClosed()) { + retrySubscribeRequest(); + } } private void retrySubscribeRequest() {