[geode] branch develop updated: GEODE-5792: ClientServerTransactionDUnitTest occasionally fails on Windows (#2529)

[jensdeppe]

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

jensdeppe 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 1a547e0  GEODE-5792: ClientServerTransactionDUnitTest occasionally 
fails on Windows (#2529)
1a547e0 is described below

commit 1a547e05fefa3e5fac5beb78160f927b76f0d25a
Author: Jens Deppe <jde...@pivotal.io>
AuthorDate: Tue Oct 2 22:02:48 2018 -0700

    GEODE-5792: ClientServerTransactionDUnitTest occasionally fails on Windows 
(#2529)
---
 .../cache/ClientServerTransactionDUnitTest.java    | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
index 0e3f149..70016bf 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
@@ -2912,15 +2912,6 @@ public class ClientServerTransactionDUnitTest extends 
RemoteTransactionDUnitTest
       }
     });
 
-    datastore1.invoke(new SerializableCallable() {
-      public Object call() throws Exception {
-        CacheServer s = getCache().addCacheServer();
-        getCache().getLogger().info("SWAP:ds1");
-        s.setPort(port2);
-        s.start();
-        return null;
-      }
-    });
     datastore1.invoke(new CreateReplicateRegion("r1"));
     datastore2.invoke(new CreateReplicateRegion("r2"));
 
@@ -2937,6 +2928,16 @@ public class ClientServerTransactionDUnitTest extends 
RemoteTransactionDUnitTest
       }
     });
 
+    datastore1.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        CacheServer s = getCache().addCacheServer();
+        getCache().getLogger().info("SWAP:ds1");
+        s.setPort(port2);
+        s.start();
+        return null;
+      }
+    });
+
     accessor.invoke(new SerializableCallable() {
       public Object call() throws Exception {
         getCache().getLogger().info("SWAP:accessor");
@@ -3012,12 +3013,6 @@ public class ClientServerTransactionDUnitTest extends 
RemoteTransactionDUnitTest
       return null;
     });
 
-    datastore1.invoke("create backup server", () -> {
-      CacheServer s = getCache().addCacheServer();
-      s.setPort(port2);
-      s.start();
-      return null;
-    });
     datastore1.invoke(new CreateReplicateRegion("r1"));
     datastore2.invoke(new CreateReplicateRegion("r1"));
 
@@ -3030,6 +3025,13 @@ public class ClientServerTransactionDUnitTest extends 
RemoteTransactionDUnitTest
       return cCache.getCacheTransactionManager().getTransactionId();
     });
 
+    datastore1.invoke("create backup server", () -> {
+      CacheServer s = getCache().addCacheServer();
+      s.setPort(port2);
+      s.start();
+      return null;
+    });
+
     server.invoke("close cache after sending tx message to other servers", () 
-> {
       final TXManagerImpl mgr = (TXManagerImpl) 
getCache().getCacheTransactionManager();
       assertTrue(mgr.isHostedTxInProgress((TXId) txId));