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 02959188A4 for ; Mon, 8 Feb 2016 21:58:35 +0000 (UTC) Received: (qmail 97005 invoked by uid 500); 8 Feb 2016 21:58:34 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 96975 invoked by uid 500); 8 Feb 2016 21:58:34 -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 96966 invoked by uid 99); 8 Feb 2016 21:58:34 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Feb 2016 21:58:34 +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 8A4651A010F for ; Mon, 8 Feb 2016 21:58:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.453 X-Spam-Level: X-Spam-Status: No, score=-3.453 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.233] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id zMfuf5NpmT26 for ; Mon, 8 Feb 2016 21:58:33 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 29B8F2139D for ; Mon, 8 Feb 2016 21:58:31 +0000 (UTC) Received: (qmail 94564 invoked by uid 99); 8 Feb 2016 21:58:29 -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, 08 Feb 2016 21:58:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7EF86E56E3; Mon, 8 Feb 2016 21:58:28 +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: Mon, 08 Feb 2016 21:58:30 -0000 Message-Id: <70a6fc36fb7a4f16b7e92833cc3c8b92@git.apache.org> In-Reply-To: <7bf1d42154634a4b8465e2af10b8b37f@git.apache.org> References: <7bf1d42154634a4b8465e2af10b8b37f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/50] [abbrv] incubator-geode git commit: GEODE-898: Fixing a race in SerialWANStatsDUnitTest GEODE-898: Fixing a race in SerialWANStatsDUnitTest testSerialPropegationConflation was a pausing a sender, but not waiting for it to pause. It's possible some events could be sent while the pause was in progress. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/359a377e Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/359a377e Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/359a377e Branch: refs/heads/feature/GEODE-773-2 Commit: 359a377e2fb1aaaafa5223da049a21e750ed26cd Parents: 8af4255 Author: Dan Smith Authored: Tue Feb 2 16:42:28 2016 -0800 Committer: Dan Smith Committed: Wed Feb 3 15:50:28 2016 -0800 ---------------------------------------------------------------------- .../internal/cache/wan/serial/SerialWANStatsDUnitTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/359a377e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java index a142f82..d946d47 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java @@ -537,7 +537,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); + vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { testName, null,1, 100, isOffHeap() }); @@ -552,7 +552,6 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues }); - pause(5000); vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() }); for(int i=0;i<500;i++) { updateKeyValues.put(i, i+"_updated"); @@ -560,8 +559,6 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues }); - pause(5000); - vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { @@ -569,8 +566,6 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues }); - pause(5000); - vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });