[geode] branch develop updated: GEODE-5325: catch DistributedSystemDisconnectedException (#2166)

[wirebaron]

This is an automated email from the ASF dual-hosted git repository.

wirebaron 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 97986d4  GEODE-5325: catch DistributedSystemDisconnectedException 
(#2166)
97986d4 is described below

commit 97986d42a377a17585812d82bf08954c108d536c
Author: Helena Bales <hba...@pivotal.io>
AuthorDate: Fri Jul 20 09:37:21 2018 -0700

    GEODE-5325: catch DistributedSystemDisconnectedException (#2166)
    
    catch DistributedSystemDisconnectedException and continue the test. This
    makes the test reliably pass, however it is indicative of a race
    condition in production code. A new GEODE ticket will be added with more
    details, however these two errors are essentially equivalent to the
    system and to users.
    
    Signed-off-by: Finn Southerland <fsoutherl...@pivotal.io>
    Signed-off-by: Helena A. Bales <hba...@pivotal.io>
---
 .../partitioned/PersistentPartitionedRegionDistributedTest.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
index bc0e925..8f9f44d 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
@@ -53,7 +53,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 import org.apache.geode.admin.AdminDistributedSystem;
@@ -73,6 +72,7 @@ import 
org.apache.geode.cache.persistence.PartitionOfflineException;
 import org.apache.geode.cache.persistence.PersistentID;
 import org.apache.geode.cache.persistence.RevokeFailedException;
 import org.apache.geode.cache.persistence.RevokedPersistentDataException;
+import org.apache.geode.distributed.DistributedSystemDisconnectedException;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.DistributionMessageObserver;
@@ -95,7 +95,6 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.rules.CacheRule;
 import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
 import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.FlakyTest;
 import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
 
 /**
@@ -952,7 +951,6 @@ public class PersistentPartitionedRegionDistributedTest 
implements Serializable
   }
 
   @Test
-  @Category(FlakyTest.class) // GEODE-5325
   public void recoversFromCloseDuringRegionOperation() throws Exception {
     vm0.invoke(() -> createPartitionedRegion(1, -1, 1, true));
     vm1.invoke(() -> createPartitionedRegion(1, -1, 1, true));
@@ -971,6 +969,9 @@ public class PersistentPartitionedRegionDistributedTest 
implements Serializable
           i++;
         } catch (CacheClosedException e) {
           break;
+        } catch (DistributedSystemDisconnectedException e) {
+          // remove this check when GEODE-5457 is resolved
+          break;
         }
       }