This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch feature/GEODE-6369 in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6369 by this push: new 337918c removed crazy import from new unit test 337918c is described below commit 337918c9cb40007fbe87788e763c6effa54c914c Author: Bruce Schuchardt <bschucha...@pivotal.io> AuthorDate: Wed Feb 13 11:09:04 2019 -0800 removed crazy import from new unit test this caused stress-tests to fail when one test interfered with another test --- .../geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java | 2 +- .../distributed/internal/membership/gms/membership/GMSJoinLeave.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java index 2afc077..e8ea800 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java @@ -14,7 +14,6 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.cache30.ReconnectDUnitTest.locator; import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT; import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION; import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION; @@ -63,6 +62,7 @@ public class ReconnectWithClusterConfigurationDUnitTest implements Serializable static final int NUM_VMS = 4; static DistributedSystem system; static Cache cache; + static Locator locator; static int[] locatorPorts = new int[NUM_LOCATORS]; static Properties dsProperties; diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java index ce022c5..3fca2ce 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java @@ -619,7 +619,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler { services.getHealthMonitor().getMembersFailingAvailabilityCheck(); check.removeAll(suspectMembers); logger.info( - "View with removed and left members removed is {}\nremoved members: {}\nleft members: {}\nsuspect members: {}", + "View with removed and left members removed is {}; removed members: {}; left members: {}; suspect members: {}", check, removedMembers, leftMembers, suspectMembers); if (check.getCoordinator().equals(localAddress)) { synchronized (viewInstallationLock) {