IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1511 from nosqlbench/mac-node-id

Browse Source 
Make sure to return an IPv4 SystemID
This commit is contained in:
Jonathan Shook 2023-09-05 18:06:19 -05:00 committed by GitHub
commit 9ed1644d91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nb-api/src/main/java/io/nosqlbench/api/metadata/SystemId.java
View File

@ -28,6 +28,7 @@ import java.nio.charset.StandardCharsets;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.*; import java.util.*;
import java.util.stream.*;
public class SystemId { public class SystemId {
@ -60,6 +61,7 @@ public class SystemId {
if (o2.getName().startsWith("e")) return 1; if (o2.getName().startsWith("e")) return 1;
return 0; return 0;
}).findFirst(); }).findFirst();
if (first.isEmpty()) return Optional.empty(); if (first.isEmpty()) return Optional.empty();
Optional<InetAddress> firstInetAddrForInterface = first.get().getInterfaceAddresses().stream() Optional<InetAddress> firstInetAddrForInterface = first.get().getInterfaceAddresses().stream()
@ -70,9 +72,22 @@ public class SystemId {
if (i2 instanceof Inet4Address) return 1; if (i2 instanceof Inet4Address) return 1;
return 0; return 0;
}).findFirst(); }).findFirst();
return firstInetAddrForInterface;
}
if ( firstInetAddrForInterface.isPresent() &&
firstInetAddrForInterface.orElse(null).getHostAddress().contains(".")) return firstInetAddrForInterface;
Optional<InetAddress> firstIpAddress = ifaces.stream()
.flatMap(i4 -> {
Iterator<InetAddress> iterator = i4.getInetAddresses().asIterator();
return StreamSupport.stream(
Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED),
false
);
}).filter(j4 -> j4.getHostAddress().contains("."))
.findFirst();
return firstIpAddress;
}
/** /**
* Using this to bypass OSHI because it calls logger init before we want it. * Using this to bypass OSHI because it calls logger init before we want it.