geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject incubator-geode git commit: GEODE-77 fixes for failing unit tests and multicast
Date Mon, 05 Oct 2015 22:02:27 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-77 b256262ef -> ba566c0c4


GEODE-77 fixes for failing unit tests and multicast


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

Branch: refs/heads/feature/GEODE-77
Commit: ba566c0c433ff23650f89a0cc9a214a3f2a271ef
Parents: b256262
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Mon Oct 5 15:02:07 2015 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Mon Oct 5 15:02:07 2015 -0700

----------------------------------------------------------------------
 .../internal/pooling/ConnectionManagerImpl.java |  2 +-
 .../internal/DistributionMessage.java           | 10 ++--
 .../distributed/internal/InternalLocator.java   |  5 +-
 .../membership/gms/fd/GMSHealthMonitor.java     |  2 +-
 .../gms/messenger/JGroupsMessenger.java         | 15 +++---
 .../membership/gms/messenger/StatRecorder.java  |  1 +
 .../gms/mgr/GMSMembershipManager.java           |  7 ++-
 .../admin/remote/ShutdownAllRequest.java        |  2 +
 .../parallel/ParallelGatewaySenderQueue.java    | 51 ++++++++++----------
 .../internal/beans/MemberMBeanBridge.java       |  4 +-
 .../internal/RegionWithHDFSBasicDUnitTest.java  |  2 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |  5 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |  8 +--
 13 files changed, 63 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
index c500e30..176658e 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
@@ -801,7 +801,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
         getPoolStats().incPrefillConnect();
       }
       catch (ServerConnectivityException ex) {
-        logger.info(LocalizedMessage.create(LocalizedStrings.ConnectionManagerImpl_UNABLE_TO_PREFILL_POOL_TO_MINIMUM_BECAUSE_0,
(Object)ex));
+        logger.info(LocalizedStrings.ConnectionManagerImpl_UNABLE_TO_PREFILL_POOL_TO_MINIMUM_BECAUSE_0.toLocalizedString(ex.getMessage()));
         return false;
       }
       finally {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
index c8ec9a2..8cefd9c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
@@ -280,15 +280,15 @@ public abstract class DistributionMessage
 
   public String getRecipientsDescription() {
     if (this.recipients == null) {
-      return "<recipients: ALL>";
+      return "recipients: ALL";
     }
     else if (this.multicast) {
-      return "<recipients: multcast>";
+      return "recipients: multicast";
     } else if (this.recipients.length > 0 && this.recipients[0] == ALL_RECIPIENTS)
{
-      return "<recipients: ALL>";
+      return "recipients: ALL";
     } else {
       StringBuffer sb = new StringBuffer(100);
-      sb.append("<recipients: ");
+      sb.append("recipients: <");
       for (int i=0; i < this.recipients.length; i++) {
         if (i != 0) {
           sb.append(", ");
@@ -485,7 +485,7 @@ public abstract class DistributionMessage
    */
   public static boolean isPreciousThread() {
     String thrname = Thread.currentThread().getName();
-    return thrname.startsWith("UDP");
+    return thrname.startsWith("Incoming-") || thrname.startsWith("OOB-");
   }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 8acde3b..ab51519 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -116,6 +116,9 @@ public class InternalLocator extends Locator implements ConnectListener
{
   
   /** system property name for inhibiting DM banner */
   public static final String INHIBIT_DM_BANNER = "Locator.inhibitDMBanner";
+  
+  /** system property name for forcing locators to be preferred as coordinators */
+  public static final String LOCATORS_PREFERRED_AS_COORDINATORS = "gemfire.disable-floating-coordinator";
 
   /////////////////////  Instance Fields  //////////////////////
 
@@ -652,7 +655,7 @@ public class InternalLocator extends Locator implements ConnectListener
{
       String prop = this.config.getSecurityPeerAuthInit();
       locatorsAreCoordinators =  (prop != null && prop.length() > 0);
       if (!locatorsAreCoordinators) {
-        locatorsAreCoordinators = Boolean.getBoolean("gemfire.disable-floating-coordinator");
+        locatorsAreCoordinators = Boolean.getBoolean(LOCATORS_PREFERRED_AS_COORDINATORS);
       }
     }
     if (locatorsAreCoordinators) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 5f04ac4..f108e49 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -379,7 +379,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler
{
     }
 
     {
-      suspectRequestCollectorThread = this.new RequestCollector<SuspectRequest>("Suspect
message collector thread", Services.getThreadGroup(), suspectRequests,
+      suspectRequestCollectorThread = this.new RequestCollector<SuspectRequest>("GemFire
Suspect Message Collector", Services.getThreadGroup(), suspectRequests,
           new Callback<SuspectRequest>() {
             @Override
             public void process(List<SuspectRequest> requests) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index 1218731..a345df1 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -449,23 +449,26 @@ public class JGroupsMessenger implements Messenger {
     
     filterOutgoingMessage(msg);
     
-    if (logger.isDebugEnabled()) {
-      logger.debug("sending via UDP: [{}] recipients: {}", msg, msg.getRecipientsDescription());
-    }
-    
     InternalDistributedMember[] destinations = msg.getRecipients();
     boolean allDestinations = msg.forAll();
     
     boolean useMcast = false;
     if (services.getConfig().getTransport().isMcastEnabled()) {
-      useMcast = !services.getManager().isMulticastAllowed()
+      useMcast = services.getManager().isMulticastAllowed()
           && (msg.getMulticast() || allDestinations);
     }
     
+    if (logger.isDebugEnabled()) {
+      String recips = "multicast";
+      if (!useMcast) {
+        recips = msg.getRecipients().toString();
+      }
+      logger.debug("sending via JGroups: [{}] recipients: {}", msg, recips);
+    }
+    
     JGAddress local = this.jgAddress;
     
     if (useMcast) {
-      logger.trace("This message is being multicast");
 
       Exception problem = null;
       try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/StatRecorder.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/StatRecorder.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/StatRecorder.java
index 8951047..8b09d24 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/StatRecorder.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/StatRecorder.java
@@ -65,6 +65,7 @@ public class StatRecorder extends Protocol {
 
   private void processForMulticast(Message msg, int direction) {
     Object o = msg.getHeader(nakackHeaderId);
+//    logger.debug("sending message with NakAck header {}: {}", o, msg);
     if (o instanceof NakAckHeader2  &&  stats != null) {
       NakAckHeader2 hdr = (NakAckHeader2)o;
       switch (direction) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index 0e3a0a6..14aa10d 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -1101,6 +1101,9 @@ public class GMSMembershipManager implements MembershipManager, Manager
       if (surpriseMembers.containsKey(member)) {
         return true;
       }
+      if (member.getVmViewId() < 0) {
+        logger.error("attempt to add a surprise member that has not yet joined the distributed
system", new Exception("stack trace"));
+      }
       if (latestView.getViewId() > member.getVmViewId()) {
         // tell the process that it should shut down distribution.
         // Run in a separate thread so we don't hold the view lock during the request.  Bug
#44995
@@ -1110,7 +1113,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
           public void run() {
             // fix for bug #42548
             // this is an old member that shouldn't be added
-            logger.fatal(LocalizedMessage.create(
+            logger.warn(LocalizedMessage.create(
                 LocalizedStrings.GroupMembershipService_Invalid_Surprise_Member, new Object[]{member,
latestView}));
             requestMemberRemoval(member, "this member is no longer in the view but is initiating
connections");
           }
@@ -1842,7 +1845,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
     if (mbr.equals(this.address)) {
       return false;
     }
-    logger.fatal(LocalizedMessage.create(
+    logger.warn(LocalizedMessage.create(
         LocalizedStrings.GroupMembershipService_MEMBERSHIP_REQUESTING_REMOVAL_OF_0_REASON_1,
         new Object[] {mbr, reason}));
     try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java
index 8654728..242f969 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java
@@ -98,6 +98,8 @@ public class ShutdownAllRequest extends AdminRequest {
       if(!(e.getCause() instanceof CancelException)) {
         e.handleAsUnexpected();
       }
+    } catch (CancelException e) {
+      // expected
     } catch (InterruptedException e) {
       interrupted = true;
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 9141905..6a35d5e 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -248,11 +248,11 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
       }
     }
     
-    if( this.buckToDispatchLock == null) {
-      this.buckToDispatchLock = new StoppableReentrantLock(sender.getCancelCriterion());
+    if( buckToDispatchLock == null) {
+      buckToDispatchLock = new StoppableReentrantLock(sender.getCancelCriterion());
     }
-    if(this.regionToDispatchedKeysMapEmpty == null) {
-      this.regionToDispatchedKeysMapEmpty = this.buckToDispatchLock.newCondition();
+    if(regionToDispatchedKeysMapEmpty == null) {
+      regionToDispatchedKeysMapEmpty = buckToDispatchLock.newCondition();
     }
     
     queueEmptyLock = new StoppableReentrantLock(sender.getCancelCriterion());
@@ -260,10 +260,10 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
     //at present, this won't be accessed by multiple threads, 
     //still, it is safer approach to synchronize it
     synchronized (ParallelGatewaySenderQueue.class) {
-      if (this.removalThread == null) {
-        this.removalThread = new BatchRemovalThread(
+      if (removalThread == null) {
+        removalThread = new BatchRemovalThread(
           (GemFireCacheImpl)sender.getCache(), this);
-        this.removalThread.start();
+        removalThread.start();
       }
     }
     
@@ -1155,22 +1155,25 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
   // This method may need synchronization in case it is used by
   // ConcurrentParallelGatewaySender
   protected void addRemovedEvent(PartitionedRegion prQ, int bucketId, Object key) {
-    buckToDispatchLock.lock();
-    boolean wasEmpty = regionToDispatchedKeysMap.isEmpty();
-    try {
-      Map bucketIdToDispatchedKeys = (Map)regionToDispatchedKeysMap.get(prQ.getFullPath());
-      if (bucketIdToDispatchedKeys == null) {
-        bucketIdToDispatchedKeys = new ConcurrentHashMap();
-        regionToDispatchedKeysMap.put(prQ.getFullPath(), bucketIdToDispatchedKeys);
+    StoppableReentrantLock lock = buckToDispatchLock;
+    if (lock != null) {
+      lock.lock();
+      boolean wasEmpty = regionToDispatchedKeysMap.isEmpty();
+      try {
+        Map bucketIdToDispatchedKeys = (Map)regionToDispatchedKeysMap.get(prQ.getFullPath());
+        if (bucketIdToDispatchedKeys == null) {
+          bucketIdToDispatchedKeys = new ConcurrentHashMap();
+          regionToDispatchedKeysMap.put(prQ.getFullPath(), bucketIdToDispatchedKeys);
+        }
+        addRemovedEventToMap(bucketIdToDispatchedKeys, bucketId, key);
+        if (wasEmpty) {
+          regionToDispatchedKeysMapEmpty.signal();        
+        }
       }
-      addRemovedEventToMap(bucketIdToDispatchedKeys, bucketId, key);
-      if (wasEmpty) {
-        regionToDispatchedKeysMapEmpty.signal();        
+      finally {
+        lock.unlock();  
       }
     }
-    finally {
-      buckToDispatchLock.unlock();  
-    }
   }
 
   private void addRemovedEventToMap(Map bucketIdToDispatchedKeys, int bucketId,
@@ -1521,12 +1524,8 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
    *          can be null.
    */
   public static void cleanUpStatics(AbstractGatewaySender sender) {
-    if (buckToDispatchLock != null) {
-      buckToDispatchLock = null;
-    }
-    if (regionToDispatchedKeysMapEmpty != null) {
-      regionToDispatchedKeysMapEmpty = null;
-    }
+    buckToDispatchLock = null;
+    regionToDispatchedKeysMapEmpty = null;
     regionToDispatchedKeysMap.clear();
     synchronized (ParallelGatewaySenderQueue.class) {
       if (removalThread != null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
index b546868..c796f7b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
@@ -354,11 +354,11 @@ public class MemberMBeanBridge {
     } catch (CacheClosedException e) {
       commandServiceInitError = e.getMessage();
       // LOG:CONFIG:
-      logger.info(LogMarker.CONFIG, "Command Service could not be initialized. {}", e.getMessage(),
e);
+      logger.info(LogMarker.CONFIG, "Command Service could not be initialized. {}", e.getMessage());
     } catch (CommandServiceException e) {
       commandServiceInitError = e.getMessage();
       // LOG:CONFIG:
-      logger.info(LogMarker.CONFIG, "Command Service could not be initialized. {}", e.getMessage(),
e);
+      logger.info(LogMarker.CONFIG, "Command Service could not be initialized. {}", e.getMessage());
     } catch (DependenciesNotFoundException e) {
       commandServiceInitError = e.getMessage();
       if (CacheServerLauncher.isDedicatedCacheServer) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/RegionWithHDFSBasicDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/RegionWithHDFSBasicDUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/RegionWithHDFSBasicDUnitTest.java
index 5a58dc5..9fb4c70 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/RegionWithHDFSBasicDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/RegionWithHDFSBasicDUnitTest.java
@@ -70,7 +70,7 @@ public class RegionWithHDFSBasicDUnitTest extends RegionWithHDFSTestBase
{
   public void setUp() throws Exception {
     super.setUp();
     ee0 = DistributedTestCase.addExpectedException("com.gemstone.gemfire.cache.RegionDestroyedException");
-    ee1 = DistributedTestCase.addExpectedException("com.gemstone.gemfire.cache.RegionDestroyedException");
+    ee1 = DistributedTestCase.addExpectedException("java.lang.InterruptedException");
   }
 
   public void tearDown2() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 089bb82..f441023 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -27,6 +27,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.DistributionException;
 import com.gemstone.gemfire.distributed.internal.DistributionManager;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.InternalLocator;
 import com.gemstone.gemfire.distributed.internal.MembershipListener;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
@@ -1792,7 +1793,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
       public void run() {
         File logFile = new File("");
         try {
-          System.setProperty("gemfire.disable-floating-coordinator", "true");
+          System.setProperty(InternalLocator.LOCATORS_PREFERRED_AS_COORDINATORS, "true");
           System.setProperty("p2p.joinTimeout", "1000");
           Properties locProps = new Properties();
           locProps.put("mcast-port", "0");
@@ -1802,7 +1803,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
           fail("While starting locator on port " + port, ex);
         }
         finally {
-          System.getProperties().remove("gemfire.disable-floating-coordinator");
+          System.getProperties().remove(InternalLocator.LOCATORS_PREFERRED_AS_COORDINATORS);
           System.getProperties().remove("p2p.joinTimeout");
         }
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba566c0c/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
index ce4b5be..3a12460 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
@@ -228,8 +228,8 @@ public class Bug43684DUnitTest extends DistributedTestCase {
     DistributedTestCase.disconnectFromDS();
     Properties props = new Properties();
     props.setProperty("locators", "localhost["+getDUnitLocatorPort()+"]");
-    props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
-    props.setProperty("log-level", "fine");
+//    props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
+//    props.setProperty("log-level", "fine");
     props.setProperty("statistic-archive-file", "server_" + OSProcess.getId()
         + ".gfs");
     props.setProperty("statistic-sampling-enabled", "true");
@@ -256,8 +256,8 @@ public class Bug43684DUnitTest extends DistributedTestCase {
   public static void createClientCache(Host host, Integer port) {
     DistributedTestCase.disconnectFromDS();
     Properties props = new Properties();
-    props.setProperty("log-file", "client_" + OSProcess.getId() + ".log");
-    props.setProperty("log-level", "fine");
+//    props.setProperty("log-file", "client_" + OSProcess.getId() + ".log");
+//    props.setProperty("log-level", "fine");
     props.setProperty("statistic-archive-file", "client_" + OSProcess.getId()
         + ".gfs");
     props.setProperty("statistic-sampling-enabled", "true");


Mime
View raw message