This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch feature/GEODE-7541b in repository https://gitbox.apache.org/repos/asf/geode.git
commit 1ab69cda2a7440d64c9edae4507b1a1304a1c2ec Author: Bruce Schuchardt <[email protected]> AuthorDate: Tue Dec 24 08:51:24 2019 -0800 GEODE-7541: revert one change One of the changes for this ticket is causing unit test failures on some machines - especially Macs - in the form of java.lang.RuntimeException: Failed to start locator Caused by: org.apache.geode.GemFireConfigException: This process is attempting to join with a loopback address (gzhou-mbpro/127.0.0.1) using a locator that does not have a local address (/10.255.200.197:60167). On Unix this usually means that /etc/hosts is misconfigured. --- .../org/apache/geode/distributed/internal/membership/gms/GMSUtil.java | 3 ++- .../internal/membership/MembershipDependenciesJUnitTest.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java index 51d2104..0708de3 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java @@ -31,6 +31,7 @@ import org.apache.logging.log4j.Logger; import org.apache.geode.distributed.internal.membership.gms.api.MemberIdentifier; import org.apache.geode.distributed.internal.membership.gms.api.MembershipConfigurationException; import org.apache.geode.distributed.internal.membership.gms.membership.HostAddress; +import org.apache.geode.internal.net.SocketCreator; import org.apache.geode.internal.serialization.DeserializationContext; import org.apache.geode.internal.serialization.SerializationContext; import org.apache.geode.internal.serialization.StaticSerialization; @@ -52,7 +53,7 @@ public class GMSUtil { try { if (bindAddress == null || bindAddress.trim().length() == 0) { - addr = InetAddress.getLocalHost(); + addr = SocketCreator.getLocalHost(); } else { addr = InetAddress.getByName(bindAddress); } diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java index 21b78ab..f2bfc72 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java @@ -33,6 +33,7 @@ import org.apache.geode.distributed.Locator; import org.apache.geode.distributed.internal.LocatorStats; import org.apache.geode.distributed.internal.membership.adapter.LocalViewMessage; import org.apache.geode.internal.OSProcess; +import org.apache.geode.internal.net.SocketCreator; import org.apache.geode.internal.security.SecurableCommunicationChannel; import org.apache.geode.internal.util.JavaWorkarounds; @@ -106,6 +107,9 @@ public class MembershipDependenciesJUnitTest { // TODO: break dependencies on locator-related classes .or(type(Locator.class)) + // TODO: + .or(type(SocketCreator.class)) + // TODO: break dependency on internal.security .or(type(SecurableCommunicationChannel.class))
