Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Simplify and unify local address getting method #8679

Merged
merged 2 commits into from Sep 8, 2021
Merged

[master] Simplify and unify local address getting method #8679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cd0e6c
simplify and unify local address getting method
zrlw Sep 4, 2021
eb6ccf6
simplify getIpByConfig()
zrlw Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
View file
Open in desktop
Expand Up @@ -243,9 +243,7 @@ public static String getIpByConfig() {
return configIp;
}

InetAddress localAddress = getLocalAddress();
String hostName = localAddress == null ? LOCALHOST_VALUE : localAddress.getHostName();
return getIpByHost(hostName);
return getLocalHost();
}

/**
Expand Down Expand Up @@ -404,8 +402,7 @@ public static NetworkInterface findNetworkInterface() {
if (addressOp.isPresent()) {
try {
if (addressOp.get().isReachable(100)) {
result = networkInterface;
break;
return networkInterface;
}
} catch (IOException e) {
// ignore
Expand Down
43 changes: 4 additions & 39 deletions dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
View file
Open in desktop
Expand Up @@ -50,11 +50,6 @@
import org.apache.dubbo.rpc.support.ProtocolUtils;

import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
Expand Down Expand Up @@ -83,7 +78,6 @@
import static org.apache.dubbo.common.constants.CommonConstants.SERVICE_NAME_MAPPING_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.DYNAMIC_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.SERVICE_REGISTRY_PROTOCOL;
import static org.apache.dubbo.common.utils.NetUtils.getAvailablePort;
import static org.apache.dubbo.common.utils.NetUtils.getLocalHost;
Expand All @@ -92,8 +86,6 @@
import static org.apache.dubbo.config.Constants.DUBBO_IP_TO_REGISTRY;
import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_BIND;
import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_REGISTRY;
import static org.apache.dubbo.config.Constants.MULTICAST;
import static org.apache.dubbo.config.Constants.MULTIPLE;
import static org.apache.dubbo.config.Constants.SCOPE_NONE;
import static org.apache.dubbo.remoting.Constants.BIND_IP_KEY;
import static org.apache.dubbo.remoting.Constants.BIND_PORT_KEY;
Expand All @@ -108,6 +100,8 @@

public class ServiceConfig<T> extends ServiceConfigBase<T> {

private static final long serialVersionUID = -412700146501624375L;

public static final Logger logger = LoggerFactory.getLogger(ServiceConfig.class);

/**
Expand Down Expand Up @@ -596,37 +590,8 @@ private String findConfigedHosts(ProtocolConfig protocolConfig,
}
if (isInvalidLocalHost(hostToBind)) {
anyhost = true;
try {
logger.info("No valid ip found from environment, try to find valid host from DNS.");
hostToBind = InetAddress.getLocalHost().getHostAddress();
} catch (UnknownHostException e) {
logger.warn(e.getMessage(), e);
}
if (isInvalidLocalHost(hostToBind)) {
if (CollectionUtils.isNotEmpty(registryURLs)) {
for (URL registryURL : registryURLs) {
if (MULTICAST.equalsIgnoreCase(registryURL.getParameter(REGISTRY_KEY))) {
// skip multicast registry since we cannot connect to it via Socket
continue;
}
if (MULTIPLE.equalsIgnoreCase(registryURL.getParameter("registry"))) {
// skip, multiple-registry address is a fake ip
continue;
}
try (Socket socket = new Socket()) {
SocketAddress addr = new InetSocketAddress(registryURL.getHost(), registryURL.getPort());
socket.connect(addr, 1000);
hostToBind = socket.getLocalAddress().getHostAddress();
break;
} catch (Exception e) {
logger.warn(e.getMessage(), e);
}
}
}
if (isInvalidLocalHost(hostToBind)) {
hostToBind = getLocalHost();
}
}
logger.info("No valid ip found from environment, try to get local host.");
hostToBind = getLocalHost();
}
}

Expand Down