diff options
Diffstat (limited to 'node-admin/src/main')
2 files changed, 6 insertions, 0 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index cbb05ace0d1..236415d1bcd 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -14,6 +14,7 @@ import com.yahoo.vespa.hosted.dockerapi.metrics.Dimensions; import com.yahoo.vespa.hosted.dockerapi.metrics.GaugeWrapper; import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; +import com.yahoo.vespa.hosted.node.admin.docker.DockerNetworking; import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations; import com.yahoo.vespa.hosted.node.admin.logging.FilebeatConfigProvider; import com.yahoo.vespa.hosted.node.admin.component.Environment; @@ -424,6 +425,10 @@ public class StorageMaintainer { "--bandwidth", Double.toString(node.getBandwidth()), "--ips", String.join(",", node.getIpAddresses()))); + if (environment.getDockerNetworking() == DockerNetworking.HOST_NETWORK) { + arguments.add("--skip-reverse-lookup"); + } + node.getHardwareDivergence().ifPresent(hardwareDivergence -> { arguments.add("--divergence"); arguments.add(hardwareDivergence); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImpl.java index 90e4b2e6c8b..8be4f3b416a 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImpl.java @@ -137,6 +137,7 @@ public class NodeAdminStateUpdaterImpl implements NodeAdminStateUpdater { // Only update hardware divergence if there is a change. if (!node.getHardwareDivergence().orElse("null").equals(hardwareDivergence)) { NodeAttributes nodeAttributes = new NodeAttributes().withHardwareDivergence(hardwareDivergence); + log.info("Updating hardware divergence to " + hardwareDivergence); nodeRepository.updateNodeAttributes(dockerHostHostName, nodeAttributes); } } catch (RuntimeException e) { |