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 8E7BD186CD for ; Wed, 25 Nov 2015 19:07:29 +0000 (UTC) Received: (qmail 84893 invoked by uid 500); 25 Nov 2015 19:07:24 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 84861 invoked by uid 500); 25 Nov 2015 19:07:24 -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 84852 invoked by uid 99); 25 Nov 2015 19:07:24 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Nov 2015 19:07:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id EA2C9180AA8 for ; Wed, 25 Nov 2015 19:07:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id BA0bJVgpUL4F for ; Wed, 25 Nov 2015 19:07:15 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id E608D429AA for ; Wed, 25 Nov 2015 19:07:14 +0000 (UTC) Received: (qmail 84095 invoked by uid 99); 25 Nov 2015 19:07:14 -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; Wed, 25 Nov 2015 19:07:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5E1F4E07D9; Wed, 25 Nov 2015 19:07:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vford13@apache.org To: commits@geode.incubator.apache.org Date: Wed, 25 Nov 2015 19:07:15 -0000 Message-Id: In-Reply-To: <7cde6054e33a43d9bcaf38e7180aa4d8@git.apache.org> References: <7cde6054e33a43d9bcaf38e7180aa4d8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/50] [abbrv] incubator-geode git commit: GEODE-335: The serial gateway sender queue size statistic is not maintained properly across restarts GEODE-335: The serial gateway sender queue size statistic is not maintained properly across restarts Incorporated changes from GemFire Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/46ec8aea Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/46ec8aea Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/46ec8aea Branch: refs/heads/feature/GEODE-78 Commit: 46ec8aeaa4a2a66e6861d5eca77446067e509ded Parents: 6fe66f3 Author: Barry Oglesby Authored: Wed Sep 16 17:39:42 2015 -0700 Committer: Barry Oglesby Committed: Wed Sep 16 17:39:42 2015 -0700 ---------------------------------------------------------------------- .../internal/cache/wan/serial/SerialGatewaySenderQueue.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/46ec8aea/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java index d2691bd..ec8c391 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java @@ -206,6 +206,8 @@ public class SerialGatewaySenderQueue implements RegionQueue { this.maximumQueueMemory = abstractSender.getMaximumMemeoryPerDispatcherQueue(); this.stats = abstractSender.getStatistics(); initializeRegion(abstractSender, listener); + // Increment queue size. Fix for bug 51988. + this.stats.incQueueSize(this.region.size()); this.removalThread = new BatchRemovalThread((GemFireCacheImpl)abstractSender.getCache()); this.removalThread.start(); this.sender = abstractSender;