[geode] 02/02: GEODE-8886: upgradeTest sometimes fails with new test (#6091)

[mh...@apache.org]

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

mhanson pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 306d5dc70b72c722f0990cbff7f6c1b346685bb7
Author: mhansonp <ha...@vmware.com>
AuthorDate: Thu Mar 4 16:30:18 2021 -0800

    GEODE-8886: upgradeTest sometimes fails with new test (#6091)
    
    (cherry picked from commit 46f90a58c234fe0bc2719c9d9c9f8091ad460917)
---
 ...ANRollingUpgradeVerifyGatewaySenderProfile.java | 60 +++-------------------
 1 file changed, 8 insertions(+), 52 deletions(-)

diff --git a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
index 02d3603..04bfea8 100644
--- a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
+++ b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
@@ -23,23 +23,25 @@ import org.junit.Test;
 import org.apache.geode.distributed.internal.InternalLocator;
 import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
 import org.apache.geode.test.dunit.DistributedTestUtils;
+import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.version.VersionManager;
 
 public class WANRollingUpgradeVerifyGatewaySenderProfile extends WANRollingUpgradeDUnitTest {
   @Test
-
-  // This test verifies that a GatewaySenderProfile serializes properly between versions.
+  // Thigit s test verifies that a GatewaySenderProfile serializes properly between versions.
   public void testVerifyGatewaySenderProfile() {
-    VM oldLocator = VM.getVM(oldVersion, 0);
-    VM oldServer = VM.getVM(oldVersion, 1);
-    VM currentServer = VM.getVM(VersionManager.CURRENT_VERSION, 2);
+    final Host host = Host.getHost(0);
+    VM oldLocator = host.getVM(oldVersion, 0);
+    VM oldServer = host.getVM(oldVersion, 1);
+    VM currentServer = host.getVM(VersionManager.CURRENT_VERSION, 2);
 
     // Start locator
     final int port = getRandomAvailableTCPPort();
     oldLocator.invoke(() -> DistributedTestUtils.deleteLocatorStateFile(port));
-    final String locators = VM.getHostName() + "[" + port + "]";
+    final String locators = NetworkUtils.getServerHostName(host) + "[" + port + "]";
     oldLocator.invoke(() -> startLocator(port, 0, locators, ""));
 
     IgnoredException ie =
@@ -71,50 +73,4 @@ public class WANRollingUpgradeVerifyGatewaySenderProfile extends WANRollingUpgra
       ie.remove();
     }
   }
-
-  @Test
-  // This test verifies that a GatewaySenderProfile serializes properly between versions.
-  public void testOldServerCanUnderstandNewGatewaySenderProfile() {
-
-    VM oldLocator = VM.getVM(oldVersion, 0);
-    VM oldServer = VM.getVM(oldVersion, 1);
-    VM currentServer = VM.getVM(VersionManager.CURRENT_VERSION, 2);
-
-    // Start locator
-    final int port = getRandomAvailableTCPPort();
-    oldLocator.invoke(() -> DistributedTestUtils.deleteLocatorStateFile(port));
-    final String locators = VM.getHostName() + "[" + port + "]";
-    oldLocator.invoke(() -> startLocator(port, 0, locators, ""));
-
-    IgnoredException ie =
-        IgnoredException.addIgnoredException("could not get remote locator information");
-    try {
-      String senderId = getName() + "_gatewaysender";
-
-      // Start current server
-      currentServer.invoke(() -> createCache(locators));
-
-      // Create GatewaySender in new server
-      currentServer.invoke(() -> createGatewaySender(senderId, 10,
-          ParallelGatewaySenderQueue.DEFAULT_MESSAGE_SYNC_INTERVAL));
-
-      // Locators before 1.4 handled configuration asynchronously.
-      // We must wait for configuration configuration to be ready, or confirm that it is disabled.
-      oldLocator.invoke(
-          () -> await()
-              .untilAsserted(() -> assertTrue(
-                  !InternalLocator.getLocator().getConfig().getEnableClusterConfiguration()
-                      || InternalLocator.getLocator().isSharedConfigurationRunning())));
-
-      // Start old server
-      oldServer.invoke(() -> createCache(locators));
-
-      // Attempt to create GatewaySender in old server
-      oldServer.invoke(() -> createGatewaySender(senderId, 10,
-          ParallelGatewaySenderQueue.DEFAULT_MESSAGE_SYNC_INTERVAL));
-
-    } finally {
-      ie.remove();
-    }
-  }
 }