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 6BA062009E2 for ; Wed, 1 Jun 2016 20:08:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6A594160A4D; Wed, 1 Jun 2016 18:08:25 +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 8BFC8160A45 for ; Wed, 1 Jun 2016 20:08:24 +0200 (CEST) Received: (qmail 45607 invoked by uid 500); 1 Jun 2016 18:08:23 -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 45598 invoked by uid 99); 1 Jun 2016 18:08:23 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 18:08:23 +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 515231800ED for ; Wed, 1 Jun 2016 18:08:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-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 mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id iNM-CdAOS_XC for ; Wed, 1 Jun 2016 18:08:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id BC71B5F247 for ; Wed, 1 Jun 2016 18:08:21 +0000 (UTC) Received: (qmail 45520 invoked by uid 99); 1 Jun 2016 18:08:21 -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, 01 Jun 2016 18:08:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0721FE0498; Wed, 1 Jun 2016 18:08:21 +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: Wed, 01 Jun 2016 18:08:21 -0000 Message-Id: <74374493e29b443dbb019ad7845a6ecb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-geode git commit: Specify getDiskDirs() and getUniqueName() for disk dirs and disk store name archived-at: Wed, 01 Jun 2016 18:08:25 -0000 Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-837 3cd19bde6 -> 51c2417a4 Specify getDiskDirs() and getUniqueName() for disk dirs and disk store name Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/59de4b86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/59de4b86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/59de4b86 Branch: refs/heads/feature/GEODE-837 Commit: 59de4b866d5818b31e7659859e97b0aae1f5d4db Parents: 3cd19bd Author: Kirk Lund Authored: Wed Jun 1 11:06:49 2016 -0700 Committer: Kirk Lund Committed: Wed Jun 1 11:06:49 2016 -0700 ---------------------------------------------------------------------- .../DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java | 7 ++----- .../cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java | 4 ++-- .../DiskDistributedNoAckSyncOverflowRegionDUnitTest.java | 8 ++------ 3 files changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59de4b86/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java index 7100a76..8e12961 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java @@ -51,14 +51,11 @@ public class DiskDistributedNoAckAsyncOverflowRegionDUnitTest extends DiskDistri AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.DISTRIBUTED_NO_ACK); - File[] diskDirs = new File[1]; - diskDirs[0] = new File("diskRegionDirs/" + OSProcess.getId()); - diskDirs[0].mkdirs(); factory.setDiskStoreName(getCache().createDiskStoreFactory() - .setDiskDirs(diskDirs) + .setDiskDirs(getDiskDirs()) .setTimeInterval(1000) .setQueueSize(0) - .create("DiskDistributedNoAckAsyncOverflowRegionDUnitTest") + .create(getUniqueName()) .getName()); factory.setEvictionAttributes(EvictionAttributes http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59de4b86/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java index 9b9d1b2..2bd2caa 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java @@ -45,10 +45,10 @@ public class DiskDistributedNoAckAsyncRegionDUnitTest extends DiskDistributedNoA diskDirs[0] = new File("diskRegionDirs/" + OSProcess.getId()); diskDirs[0].mkdirs(); factory.setDiskStoreName(getCache().createDiskStoreFactory() - .setDiskDirs(diskDirs) + .setDiskDirs(getDiskDirs()) .setTimeInterval(1000) .setQueueSize(0) - .create("DiskDistributedNoAckAsyncRegionDUnitTest") + .create(getUniqueName()) .getName()); factory.setDiskSynchronous(false); factory.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59de4b86/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java index 40ed127..75d4f20 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java @@ -41,13 +41,9 @@ public class DiskDistributedNoAckSyncOverflowRegionDUnitTest extends DiskDistrib AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.DISTRIBUTED_NO_ACK); - File[] diskDirs = new File[1]; - diskDirs[0] = new File("diskRegionDirs/" + OSProcess.getId()); - diskDirs[0].mkdirs(); - factory.setDiskStoreName(getCache().createDiskStoreFactory() - .setDiskDirs(diskDirs) - .create("DiskDistributedNoAckSyncOverflowRegionDUnitTest") + .setDiskDirs(getDiskDirs()) + .create(getUniqueName()) .getName()); factory.setEvictionAttributes(EvictionAttributes