Bill commented on a change in pull request #5273:
URL: https://github.com/apache/geode/pull/5273#discussion_r447181500



##########
File path: 
geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
##########
@@ -191,20 +207,26 @@ void doTestRollAll(String regionType, String objectType, 
String startingVersion)
       }
 
       putAndVerify(objectType, server1, regionName, 0, 10, server2);
-      locator = rollLocatorToCurrent(locator, hostName, locatorPorts[0], 
getTestMethodName(),
-          locatorString);
+      locator =
+          rollLocatorToCurrent(locator, hostName, locatorPort, locatorProps, 
getTestMethodName(),
+              locatorString);
 
       server1 = rollServerToCurrentAndCreateRegion(server1, regionType, 
testingDirs[0],
-          shortcutName, regionName, locatorPorts);
+          shortcutName, regionName, new int[] {locatorPort});
       verifyValues(objectType, regionName, 0, 10, server1);
       putAndVerify(objectType, server1, regionName, 5, 15, server2);
       putAndVerify(objectType, server2, regionName, 10, 20, server1);
 
       server2 = rollServerToCurrentAndCreateRegion(server2, regionType, 
testingDirs[1],
-          shortcutName, regionName, locatorPorts);
+          shortcutName, regionName, ports);
       verifyValues(objectType, regionName, 0, 10, server2);
       putAndVerify(objectType, server2, regionName, 15, 25, server1);
 
+      String shutDownCommand = "shutdown --include-locators=true";

Review comment:
       My latest commit eliminates `gfsh` entirely so the issue with 
`shutDownCommand` is moot.
   
   I eliminated use of `gfsh` because I found the test had become flaky on 
versions 1.3.0-1.8.0, at least on macOS. On Linux (CI) I did not see the 
flakiness. But rather than figuring that out, I decided to grab the view more 
directly: by accessing `InternalDistributedSystem` in the locator JVM.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to