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 6B2D7200C10 for ; Fri, 3 Feb 2017 21:07:10 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 69CBB160B43; Fri, 3 Feb 2017 20:07:10 +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 B4FB4160B3F for ; Fri, 3 Feb 2017 21:07:09 +0100 (CET) Received: (qmail 32428 invoked by uid 500); 3 Feb 2017 20:07:09 -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 32418 invoked by uid 99); 3 Feb 2017 20:07:09 -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, 03 Feb 2017 20:07:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D3489DFBE6; Fri, 3 Feb 2017 20:07:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agingade@apache.org To: commits@geode.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: GEODE-1672: Added recovery wait for all the regions created to address race condition in the test. Date: Fri, 3 Feb 2017 20:07:08 +0000 (UTC) archived-at: Fri, 03 Feb 2017 20:07:10 -0000 Repository: geode Updated Branches: refs/heads/develop 3a12d6119 -> 086df14b0 GEODE-1672: Added recovery wait for all the regions created to address race condition in the test. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/086df14b Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/086df14b Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/086df14b Branch: refs/heads/develop Commit: 086df14b0dce92c5dd0678f36879533d310d9a37 Parents: 3a12d61 Author: Anil Authored: Fri Feb 3 12:06:07 2017 -0800 Committer: Anil Committed: Fri Feb 3 12:06:07 2017 -0800 ---------------------------------------------------------------------- .../geode/internal/cache/DiskLruRegRecoveryJUnitTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/086df14b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java index bf5a71a..b91d294 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java @@ -64,6 +64,7 @@ public class DiskLruRegRecoveryJUnitTest extends DiskRegionTestingBase { DiskRegionProperties diskProps = new DiskRegionProperties(); Region nonLruRegion = null; + int numRegions = 1; diskProps.setDiskDirs(dirs); diskProps.setPersistBackup(true); @@ -78,6 +79,7 @@ public class DiskLruRegRecoveryJUnitTest extends DiskRegionTestingBase { } if (addNonLruRegion) { + numRegions++; nonLruRegion = createNonLruRegion(); } @@ -98,7 +100,8 @@ public class DiskLruRegRecoveryJUnitTest extends DiskRegionTestingBase { } } - final CountDownLatch recoveryDone = new CountDownLatch(1); + // Regions are created with its own disk store. + final CountDownLatch recoveryDone = new CountDownLatch(numRegions); DiskStoreObserver.setInstance(new DiskStoreObserver() { @Override public void afterAsyncValueRecovery(DiskStoreImpl store) {