[47/51] [abbrv] geode git commit: GEODE-3150 Changed the diskstore name used with testDiskConflictWithCoLocation to isolate the problem related to diskstore.

2017-07-10 Thread jensdeppe 
GEODE-3150 Changed the diskstore name used with testDiskConflictWithCoLocation
to isolate the problem related to diskstore.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5f38a489
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5f38a489
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5f38a489

Branch: refs/heads/feature/GEODE-3109
Commit: 5f38a489a5425725cd4eeb2a1b53ae69f481a9f5
Parents: 1537847
Author: Anil 
Authored: Fri Jul 7 16:44:54 2017 -0700
Committer: Anil 
Committed: Fri Jul 7 16:46:25 2017 -0700

--
 .../partitioned/PersistentPartitionedRegionDUnitTest.java |  3 +--
 .../partitioned/PersistentPartitionedRegionTestBase.java  | 10 ++
 2 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/5f38a489/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index 098a14c..bd3bb44 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -2167,8 +2167,7 @@ public class PersistentPartitionedRegionDUnitTest extends 
PersistentPartitionedR
   }
 }
 
-closePR(vm1, PR_CHILD_REGION_NAME);
-closePR(vm1);
+closeCache(vm1);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/5f38a489/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
index ec0ec4c..45c6120 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
@@ -387,6 +387,8 @@ public abstract class PersistentPartitionedRegionTestBase 
extends JUnit4CacheTes
   protected void createCoLocatedPR(VM vm, int setRedundantCopies,
   boolean setPersistenceAdvisorObserver) {
 vm.invoke(() -> {
+  String dsName = "colacatedpr";
+  
   Cache cache = getCache();
 
   // Wait for both nested PRs to be created
@@ -422,9 +424,9 @@ public abstract class PersistentPartitionedRegionTestBase 
extends JUnit4CacheTes
 
   // Create region.
   try {
-DiskStore ds = cache.findDiskStore("disk");
+DiskStore ds = cache.findDiskStore(dsName);
 if (ds == null) {
-  ds = 
cache.createDiskStoreFactory().setDiskDirs(getDiskDirs()).create("disk");
+  ds = 
cache.createDiskStoreFactory().setDiskDirs(getDiskDirs()).create(dsName);
 }
 
 // Parent Region
@@ -433,7 +435,7 @@ public abstract class PersistentPartitionedRegionTestBase 
extends JUnit4CacheTes
 AttributesFactory af = new AttributesFactory();
 af.setPartitionAttributes(paf.create());
 af.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);
-af.setDiskStoreName("disk");
+af.setDiskStoreName(dsName);
 cache.createRegion(PR_REGION_NAME, af.create());
 
 // Colocated region
@@ -442,7 +444,7 @@ public abstract class PersistentPartitionedRegionTestBase 
extends JUnit4CacheTes
 af = new AttributesFactory();
 af.setPartitionAttributes(paf.create());
 af.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);
-af.setDiskStoreName("disk");
+af.setDiskStoreName(dsName);
 cache.createRegion(PR_CHILD_REGION_NAME, af.create());
 
 // Count down on region create.

geode git commit: GEODE-3150 Changed the diskstore name used with testDiskConflictWithCoLocation to isolate the problem related to diskstore.

2017-07-07 Thread agingade 
Repository: geode
Updated Branches:
  refs/heads/develop 1537847e6 -> 5f38a489a


GEODE-3150 Changed the diskstore name used with testDiskConflictWithCoLocation
to isolate the problem related to diskstore.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5f38a489
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5f38a489
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5f38a489

Branch: refs/heads/develop
Commit: 5f38a489a5425725cd4eeb2a1b53ae69f481a9f5
Parents: 1537847
Author: Anil 
Authored: Fri Jul 7 16:44:54 2017 -0700
Committer: Anil 
Committed: Fri Jul 7 16:46:25 2017 -0700

--
 .../partitioned/PersistentPartitionedRegionDUnitTest.java |  3 +--
 .../partitioned/PersistentPartitionedRegionTestBase.java  | 10 ++
 2 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/5f38a489/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index 098a14c..bd3bb44 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -2167,8 +2167,7 @@ public class PersistentPartitionedRegionDUnitTest extends 
PersistentPartitionedR
   }
 }
 
-closePR(vm1, PR_CHILD_REGION_NAME);
-closePR(vm1);
+closeCache(vm1);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/5f38a489/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
index ec0ec4c..45c6120 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
@@ -387,6 +387,8 @@ public abstract class PersistentPartitionedRegionTestBase 
extends JUnit4CacheTes
   protected void createCoLocatedPR(VM vm, int setRedundantCopies,
   boolean setPersistenceAdvisorObserver) {
 vm.invoke(() -> {
+  String dsName = "colacatedpr";
+  
   Cache cache = getCache();
 
   // Wait for both nested PRs to be created
@@ -422,9 +424,9 @@ public abstract class PersistentPartitionedRegionTestBase 
extends JUnit4CacheTes
 
   // Create region.
   try {
-DiskStore ds = cache.findDiskStore("disk");
+DiskStore ds = cache.findDiskStore(dsName);
 if (ds == null) {
-  ds = 
cache.createDiskStoreFactory().setDiskDirs(getDiskDirs()).create("disk");
+  ds = 
cache.createDiskStoreFactory().setDiskDirs(getDiskDirs()).create(dsName);
 }
 
 // Parent Region
@@ -433,7 +435,7 @@ public abstract class PersistentPartitionedRegionTestBase 
extends JUnit4CacheTes
 AttributesFactory af = new AttributesFactory();
 af.setPartitionAttributes(paf.create());
 af.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);
-af.setDiskStoreName("disk");
+af.setDiskStoreName(dsName);
 cache.createRegion(PR_REGION_NAME, af.create());
 
 // Colocated region
@@ -442,7 +444,7 @@ public abstract class PersistentPartitionedRegionTestBase 
extends JUnit4CacheTes
 af = new AttributesFactory();
 af.setPartitionAttributes(paf.create());
 af.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);
-af.setDiskStoreName("disk");
+af.setDiskStoreName(dsName);
 cache.createRegion(PR_CHILD_REGION_NAME, af.create());
 
 // Count down on region create.