Remove hardwareDivergence from node-admin

5 files changed, 2 insertions, 26 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java
index 8d2b5414fa8..8c8adf5c190 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java
@@ -70,11 +70,6 @@ public class NodeAttributes {
         return this;
     }
 
-    public NodeAttributes withHardwareDivergence(String hardwareDivergence) {
-        this.hardwareDivergence = Optional.of(hardwareDivergence);
-        return this;
-    }
-
     public NodeAttributes withHardwareFailureDescription(String hardwareFailureDescription) {
         this.hardwareFailureDescription = Optional.of(hardwareFailureDescription);
         return this;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
index 7b4fcc4ae24..ac65ac8af35 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
@@ -56,7 +56,6 @@ public class NodeSpec {
     private final double bandwidth;
     private final Set<String> ipAddresses;
 
-    private final Optional<String> hardwareDivergence;
     private final Optional<String> hardwareFailureDescription;
     private final NodeReports reports;
 
@@ -91,7 +90,6 @@ public class NodeSpec {
             boolean fastDisk,
             double bandwidth,
             Set<String> ipAddresses,
-            Optional<String> hardwareDivergence,
             Optional<String> hardwareFailureDescription,
             NodeReports reports,
             Optional<String> parentHostname) {
@@ -123,7 +121,6 @@ public class NodeSpec {
         this.fastDisk = fastDisk;
         this.bandwidth = bandwidth;
         this.ipAddresses = Objects.requireNonNull(ipAddresses);
-        this.hardwareDivergence = Objects.requireNonNull(hardwareDivergence);
         this.hardwareFailureDescription = Objects.requireNonNull(hardwareFailureDescription);
         this.reports = Objects.requireNonNull(reports);
         this.parentHostname = Objects.requireNonNull(parentHostname);
@@ -241,10 +238,6 @@ public class NodeSpec {
         return ipAddresses;
     }
 
-    public Optional<String> getHardwareDivergence() {
-        return hardwareDivergence;
-    }
-
     public Optional<String> getHardwareFailureDescription() {
         return hardwareFailureDescription;
     }
@@ -289,7 +282,6 @@ public class NodeSpec {
                 Objects.equals(fastDisk, that.fastDisk) &&
                 Objects.equals(bandwidth, that.bandwidth) &&
                 Objects.equals(ipAddresses, that.ipAddresses) &&
-                Objects.equals(hardwareDivergence, that.hardwareDivergence) &&
                 Objects.equals(hardwareFailureDescription, that.hardwareFailureDescription) &&
                 Objects.equals(reports, that.reports) &&
                 Objects.equals(parentHostname, that.parentHostname);
@@ -325,7 +317,6 @@ public class NodeSpec {
                 fastDisk,
                 bandwidth,
                 ipAddresses,
-                hardwareDivergence,
                 hardwareFailureDescription,
                 reports,
                 parentHostname);
@@ -361,7 +352,6 @@ public class NodeSpec {
                 + " fastDisk=" + fastDisk
                 + " bandwidth=" + bandwidth
                 + " ipAddresses=" + ipAddresses
-                + " hardwareDivergence=" + hardwareDivergence
                 + " hardwareFailureDescription=" + hardwareFailureDescription
                 + " reports=" + reports
                 + " parentHostname=" + parentHostname
@@ -563,7 +553,6 @@ public class NodeSpec {
             node.currentRestartGeneration.ifPresent(this::currentRestartGeneration);
             node.wantedFirmwareCheck.ifPresent(this::wantedFirmwareCheck);
             node.currentFirmwareCheck.ifPresent(this::currentFirmwareCheck);
-            node.hardwareDivergence.ifPresent(this::hardwareDivergence);
             node.hardwareFailureDescription.ifPresent(this::hardwareFailureDescription);
             node.parentHostname.ifPresent(this::parentHostname);
         }
@@ -846,10 +835,6 @@ public class NodeSpec {
             return ipAddresses;
         }
 
-        public Optional<String> getHardwareDivergence() {
-            return hardwareDivergence;
-        }
-
         public Optional<String> getHardwareFailureDescription() {
             return hardwareFailureDescription;
         }
@@ -871,7 +856,7 @@ public class NodeSpec {
                     wantedRebootGeneration, currentRebootGeneration,
                     wantedFirmwareCheck, currentFirmwareCheck, modelName,
                     minCpuCores, minMainMemoryAvailableGb, minDiskAvailableGb,
-                    fastDisk, bandwidth, ipAddresses, hardwareDivergence, hardwareFailureDescription,
+                    fastDisk, bandwidth, ipAddresses, hardwareFailureDescription,
                     reports, parentHostname);
         }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
index c92f4523e6d..8e63024842d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
@@ -214,7 +214,6 @@ public class RealNodeRepository implements NodeRepository {
                 node.fastDisk,
                 node.bandwidth,
                 node.ipAddresses,
-                Optional.ofNullable(node.hardwareDivergence),
                 Optional.ofNullable(node.hardwareFailureDescription),
                 reports,
                 Optional.ofNullable(node.parentHostname));
@@ -240,7 +239,6 @@ public class RealNodeRepository implements NodeRepository {
         node.vespaVersion = nodeAttributes.getVespaVersion().orElse(null);
         node.currentOsVersion = nodeAttributes.getCurrentOsVersion().orElse(null);
         node.currentFirmwareCheck = nodeAttributes.getCurrentFirmwareCheck().map(Instant::toEpochMilli).orElse(null);
-        node.hardwareDivergence = nodeAttributes.getHardwareDivergence().orElse(null);
         node.hardwareFailureDescription = nodeAttributes.getHardwareFailureDescription().orElse(null);
         node.wantToDeprovision = nodeAttributes.getWantToDeprovision().orElse(null);
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java
index 751732e3270..a4cf61ef88f 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java
@@ -66,8 +66,6 @@ public class NodeRepositoryNode {
     public Boolean hardwareFailure;
     @JsonProperty("hardwareFailureDescription")
     public String hardwareFailureDescription;
-    @JsonProperty("hardwareDivergence")
-    public String hardwareDivergence;
     @JsonProperty("environment")
     public String environment;
     @JsonProperty("type")
@@ -122,7 +120,6 @@ public class NodeRepositoryNode {
                 ", bandwidth=" + bandwidth +
                 ", hardwareFailure=" + hardwareFailure +
                 ", hardwareFailureDescription='" + hardwareFailureDescription + '\'' +
-                ", hardwareDivergence='" + hardwareDivergence + '\'' +
                 ", environment='" + environment + '\'' +
                 ", type='" + type + '\'' +
                 ", wantedDockerImage='" + wantedDockerImage + '\'' +
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
index 28e036169fa..e17aa459d1d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
@@ -231,6 +231,7 @@ public class NodeFailer extends Maintainer {
 
     private static List<String> reasonsToRetireActiveParentHost(Node hostNode) {
         return Stream.of(
+                "badMicrocode",
                 "badTotalMemorySize",
                 "badTotalDiskSize",
                 "badDiskType",