You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2020/03/27 09:51:24 UTC
svn commit: r1875770 - in /jackrabbit/oak/branches/1.22: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
Author: reschke
Date: Fri Mar 27 09:51:23 2020
New Revision: 1875770
URL: http://svn.apache.org/viewvc?rev=1875770&view=rev
Log:
OAK-8935: Improve ClusterNodeInfo MAC address detection (merged r1875531 into 1.22)
Modified:
jackrabbit/oak/branches/1.22/ (props changed)
jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
Propchange: jackrabbit/oak/branches/1.22/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1875531
Modified: jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1875770&r1=1875769&r2=1875770&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java (original)
+++ jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java Fri Mar 27 09:51:23 2020
@@ -1226,8 +1226,9 @@ public class ClusterNodeInfo {
if (hwa.length == 6) {
// likely a MAC address
String displayName = ni.getDisplayName().toLowerCase(Locale.ENGLISH);
- // de-prioritize addresses that are likely to be virtual (see OAK-3885)
- boolean looksVirtual = displayName.indexOf("virtual") >= 0 || displayName.indexOf("vpn") >= 0;
+ // de-prioritize addresses that are likely to be virtual (see OAK-3885 and OAK-8935)
+ boolean looksVirtual = displayName.indexOf("virtual") >= 0 || displayName.indexOf("vpn") >= 0
+ || displayName.indexOf("docker") >= 0;
if (!looksVirtual) {
macAddresses.add(str);
} else {
@@ -1294,4 +1295,4 @@ public class ClusterNodeInfo {
private static String asISO8601(long ms) {
return DateTimeFormatter.ISO_INSTANT.format(Instant.ofEpochMilli(ms));
}
-}
\ No newline at end of file
+}