From commits-return-27381-archive-asf-public=cust-asf.ponee.io@geode.apache.org Mon Jul 9 22:30:14 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id EA7BA18062A for ; Mon, 9 Jul 2018 22:30:13 +0200 (CEST) Received: (qmail 95095 invoked by uid 500); 9 Jul 2018 20:30:13 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 95086 invoked by uid 99); 9 Jul 2018 20:30:13 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2018 20:30:13 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 63EA281EE5; Mon, 9 Jul 2018 20:30:12 +0000 (UTC) Date: Mon, 09 Jul 2018 20:30:11 +0000 To: "commits@geode.apache.org" Subject: [geode] branch develop updated: GEODE-5383: Check that data propagated earlier MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153116821145.15796.5771952159625861733@gitbox.apache.org> From: upthewaterspout@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: 1eb027597291a39acfce4ab68a02c941b71d33a5 X-Git-Newrev: b79b64a7cbdc4de1ffc1fe34222b56ac867ab38c X-Git-Rev: b79b64a7cbdc4de1ffc1fe34222b56ac867ab38c X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new b79b64a GEODE-5383: Check that data propagated earlier b79b64a is described below commit b79b64a7cbdc4de1ffc1fe34222b56ac867ab38c Author: Helena A. Bales AuthorDate: Fri Jul 6 15:01:08 2018 -0700 GEODE-5383: Check that data propagated earlier Check that the data is propagated through WAN before checking the status of the event queues. This test was flaky because the event queues were being checked before the events had been added to the event queue, so the queue was changing as it was being checked. By checking that the data has been propaged to the other cluster first, we can know that all events have been added. Co-authored-by: Finn Southerland --- .../test/java/org/apache/geode/internal/cache/wan/WANTestBase.java | 2 +- .../apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java index 2cdb1c8..3f995c6 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java @@ -3296,7 +3296,7 @@ public class WANTestBase extends DistributedTestCase { + abstractSender.getSecondaryEventQueueSize() + ". Queue content is: " + displayQueueContent(queue), 0, abstractSender.getSecondaryEventQueueSize()); }); - assertEquals("Except events in all secondary queues after drain is 0", 0, + assertEquals("Expected events in all secondary queues after drain is 0", 0, abstractSender.getSecondaryEventQueueSize()); } finally { exp.remove(); diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java index 588dab7..be3fd1d 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java @@ -156,12 +156,14 @@ public class DistTXWANDUnitTest extends WANTestBase { vm4.invoke(() -> WANTestBase.doDistTXPuts(getTestMethodName() + "_PR", 5)); + // verify that the data was received + vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 5)); + // verify all buckets drained on all sender nodes. vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln")); vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln")); vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln")); vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln")); - vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 5)); } }