GEODE-8752: Revoke using member's actual address (#5797)
When revoking a persistent member,
PersistentPartitionedRegionDistributedTest now uses the to-be-revoked
member's actual inet address in the revocation pattern.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
index 81777a1..0566134 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
@@ -39,11 +39,7 @@
import static org.junit.Assert.assertEquals;
import java.io.Serializable;
-import java.net.Inet4Address;
import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -370,6 +366,8 @@
Set<Integer> bucketsOnVM1 = vm1.invoke(this::getBucketList);
assertThat(bucketsOnVM1).isEqualTo(bucketsOnVM0);
+ InetAddress vm1Address = vm1.invoke(() -> getSystem().getDistributedMember().getInetAddress());
+
// This should fail with a revocation failed message
try (IgnoredException ie = addIgnoredException(RevokeFailedException.class)) {
vm2.invoke("revoke disk store should fail", () -> {
@@ -380,7 +378,7 @@
try {
adminDS.waitToBeConnected(MINUTES.toMillis(2));
- adminDS.revokePersistentMember(getFirstInet4Address(), null);
+ adminDS.revokePersistentMember(vm1Address, null);
} finally {
adminDS.disconnect();
}
@@ -402,7 +400,7 @@
adminDS.connect();
try {
adminDS.waitToBeConnected(MINUTES.toMillis(2));
- adminDS.revokePersistentMember(getFirstInet4Address(), diskDirPathOnVM1);
+ adminDS.revokePersistentMember(vm1Address, diskDirPathOnVM1);
} finally {
adminDS.disconnect();
}
@@ -1673,19 +1671,6 @@
}
}
- private static InetAddress getFirstInet4Address() throws SocketException, UnknownHostException {
- for (NetworkInterface netint : Collections.list(NetworkInterface.getNetworkInterfaces())) {
- for (InetAddress inetAddress : Collections.list(netint.getInetAddresses())) {
- if (inetAddress instanceof Inet4Address && !inetAddress.isLoopbackAddress()) {
- return inetAddress;
- }
- }
- }
-
- // If no INet4Address was found for any of the interfaces above, default to getLocalHost()
- return InetAddress.getLocalHost();
- }
-
private InternalCache getCache() {
return cacheRule.getOrCreateCache();
}
