Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33B1D19085 for ; Mon, 21 Mar 2016 20:39:40 +0000 (UTC) Received: (qmail 40495 invoked by uid 500); 21 Mar 2016 20:39:40 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 40381 invoked by uid 500); 21 Mar 2016 20:39:40 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 40364 invoked by uid 99); 21 Mar 2016 20:39:40 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2016 20:39:40 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 82C421A0889 for ; Mon, 21 Mar 2016 20:39:39 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id UHInf7sGN8mu for ; Mon, 21 Mar 2016 20:39:38 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id D591C5FC04 for ; Mon, 21 Mar 2016 20:39:34 +0000 (UTC) Received: (qmail 38075 invoked by uid 99); 21 Mar 2016 20:39: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; Mon, 21 Mar 2016 20:39:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 00508DFBC9; Mon, 21 Mar 2016 20:39:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jensdeppe@apache.org To: commits@geode.incubator.apache.org Date: Mon, 21 Mar 2016 20:40:05 -0000 Message-Id: <7160b331172745f4a9decd91cd8bd525@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [34/54] [abbrv] incubator-geode git commit: GEODE-1103 intermittent suspect string in server cache during shutdown GEODE-1103 intermittent suspect string in server cache during shutdown Added an exception handler for InterruptedException that checks to see if the AcceptorImpl is shutting down. If so a warning message about the interrupt is not logged. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bec420bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bec420bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bec420bf Branch: refs/heads/feature/GEODE-17-2 Commit: bec420bf54d7c78a8a81264f41b578f529453327 Parents: 442718f Author: Bruce Schuchardt Authored: Wed Mar 16 16:02:30 2016 -0700 Committer: Bruce Schuchardt Committed: Wed Mar 16 16:02:30 2016 -0700 ---------------------------------------------------------------------- .../gemfire/internal/cache/tier/sockets/AcceptorImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bec420bf/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java index 89c073f..9f18f50 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java @@ -1682,12 +1682,13 @@ public class AcceptorImpl extends Acceptor implements Runnable } } // synchronized - } - catch (Exception e) {/* ignore */ + } catch (InterruptedException e) { + if (!this.shutdown) { // GEODE-1103: expect an interrupt during shutdown + logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_UNEXPECTED), e); + } + } catch (Exception e) {/* ignore */ logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_UNEXPECTED), e); } - finally{ - } } private void shutdownSCs() {