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

PAYARA-2352 Fix Windows Data Grid Discovery #2232

Merged
merged 3 commits into from
Dec 28, 2017
Merged

PAYARA-2352 Fix Windows Data Grid Discovery #2232

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd776cf
PAYARA-2352 PAYARA-2342 Fix domain discovery mode on Windows
smillidge Dec 26, 2017
0b52f2e
PAYARA-2352 Add further fallbacks if no IP address is determined via …
smillidge Dec 28, 2017
8bf67b9
Merge branch 'Payara-5' into PAYARA-2352
smillidge Dec 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions .../hazelcast-bootstrap/src/main/java/fish/payara/nucleus/hazelcast/MemberAddressPicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import java.net.InetSocketAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.NoSuchElementException;
Expand Down Expand Up @@ -126,20 +127,13 @@ private void findAppropriateInterfaces() {
Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
while (interfaces.hasMoreElements()) {
NetworkInterface intf = interfaces.nextElement();
try {
logger.log(Level.FINE, "Found Network Interface {0} Address {1}", new Object[]{intf.getName(),
intf.getInetAddresses().nextElement()});
} catch (NoSuchElementException nsee) {
logger.log(Level.FINER, "Could not obtain address information for Network Interface: "
+ intf.getName(), nsee);
logger.log(Level.FINE, "Found Network Interface {0}", intf.getName());
}
logger.log(Level.FINE, "Found Network Interface {0}", new Object[]{intf.getName()});

if (!intf.isLoopback() && !intf.getName().contains("docker0")) {
if (intf.isUp() && !intf.isLoopback() && !intf.isVirtual() && !intf.getName().contains("docker0") &&!intf.getDisplayName().contains("Teredo") && intf.getInterfaceAddresses().size()>0) {
logger.log(Level.FINE, "Adding interface {0} as a possible interface", intf.getName());
possibleInterfaces.add(intf);
} else {
logger.fine("Ignoring docker or loopback interface " + intf.getName());
logger.fine("Ignoring down, docker or loopback interface " + intf.getName());
}
}
} catch (SocketException socketException) {
Expand All @@ -162,6 +156,17 @@ private void findAppropriateInterfaces() {
logger.log(Level.FINE, "Picked address {0}", chosenAddress);
bindAddress = new InetSocketAddress(chosenAddress,port);
}

if (bindAddress == null) {
try {
// ok do the easy thing
logger.log(Level.FINE,"Could not find an appropriate address by searching falling back to local host");
bindAddress = new InetSocketAddress(InetAddress.getLocalHost(),port);
} catch (UnknownHostException ex) {
logger.log(Level.FINE,"Could not find local host, falling back to loop back address");
bindAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(),port);
}
}
}

}