You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2019/02/20 22:27:57 UTC
[geode] branch feature/GEODE-6423 updated: abandon suspect check
when shut down
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-6423
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6423 by this push:
new a4af094 abandon suspect check when shut down
a4af094 is described below
commit a4af0945211a831b643709a2fe6e8932a5681066
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Wed Feb 20 14:27:18 2019 -0800
abandon suspect check when shut down
---
.../geode/internal/cache/PersistentRegionRecoveryDUnitTest.java | 2 ++
.../distributed/internal/membership/gms/fd/GMSHealthMonitor.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionRecoveryDUnitTest.java
index 01d3f4b..fcd4b8a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionRecoveryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionRecoveryDUnitTest.java
@@ -39,6 +39,7 @@ import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.internal.cache.backup.BackupOperation;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.rules.CacheRule;
@@ -73,6 +74,7 @@ public class PersistentRegionRecoveryDUnitTest extends JUnit4DistributedTestCase
vm0 = getVM(0);
vm1 = getVM(1);
regionName = getClass().getSimpleName() + "-" + testName.getMethodName();
+ IgnoredException.addIgnoredException("Possible loss of quorum");
}
@Test
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 7f63c91..05c0a34 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -541,7 +541,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
} catch (IOException e) {
// this is expected if it is a connection-timeout or other failure
// to connect
- } catch (IllegalStateException e) {
+ } catch (IllegalStateException | GemFireConfigException e) {
if (!isStopping) {
logger.trace("Unexpected exception", e);
}
@@ -555,7 +555,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
// expected
}
}
- } while (!passed && System.nanoTime() < giveupTime);
+ } while (!passed && !this.isShutdown() && System.nanoTime() < giveupTime);
return passed;
}