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 96457200B74 for ; Fri, 22 Jul 2016 07:17:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 94F50160A87; Fri, 22 Jul 2016 05:17:45 +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 D067F160A91 for ; Fri, 22 Jul 2016 07:17:44 +0200 (CEST) Received: (qmail 29317 invoked by uid 500); 22 Jul 2016 05:17:43 -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 29299 invoked by uid 99); 22 Jul 2016 05:17:43 -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; Fri, 22 Jul 2016 05:17:43 +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 65C921A5EC5 for ; Fri, 22 Jul 2016 05:17:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 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=-1.426] autolearn=disabled Received: from mx1-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 M1N2imw7LC33 for ; Fri, 22 Jul 2016 05:17:41 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 9489B60DC8 for ; Fri, 22 Jul 2016 05:17:40 +0000 (UTC) Received: (qmail 29070 invoked by uid 99); 22 Jul 2016 05:17:39 -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; Fri, 22 Jul 2016 05:17:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58D10E6810; Fri, 22 Jul 2016 05:17:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Fri, 22 Jul 2016 05:17:44 -0000 Message-Id: <80a7bcd5912a4340b849b5267842c08c@git.apache.org> In-Reply-To: <228fbc31db714d4bb23977c0824d61fa@git.apache.org> References: <228fbc31db714d4bb23977c0824d61fa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/10] incubator-geode git commit: GEODE-1420: fix 100ms delay in stopping tombstone sweeper archived-at: Fri, 22 Jul 2016 05:17:45 -0000 GEODE-1420: fix 100ms delay in stopping tombstone sweeper Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/54f305be Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/54f305be Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/54f305be Branch: refs/heads/feature/GEODE-1673-PR-212 Commit: 54f305be774312bed7125fe6b0abcf19f6f2c11a Parents: 3e6eb4c Author: Darrel Schneider Authored: Wed Jul 20 16:39:00 2016 -0700 Committer: Darrel Schneider Committed: Thu Jul 21 10:41:40 2016 -0700 ---------------------------------------------------------------------- .../com/gemstone/gemfire/internal/cache/TombstoneService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/54f305be/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java index 192e24d..2241b33 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java @@ -787,9 +787,9 @@ public class TombstoneService { this.sweeperThread.start(); } - synchronized void stop() { - this.isStopped = true; - if (this.sweeperThread != null) { + void stop() { + synchronized (this) { + this.isStopped = true; notifyAll(); } try { @@ -797,7 +797,6 @@ public class TombstoneService { } catch (InterruptedException e) { Thread.currentThread().interrupt(); } - getQueue().clear(); } private void lockQueueHead() {