Longer hardware failure names

7 files changed, 21 insertions, 21 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java
index 3b1619c34c9..be27097dba7 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java
@@ -25,11 +25,11 @@ public class Status {
     public enum HardwareFailureType {
         
         /** There are mce log error messages */
-        mce,
-        /** There are SMART log error messages */
-        smart,
+        memory_mcelog,
+        /** There are smart log error messages */
+        disk_smart,
         /** There are kernel log error messages */
-        kernel,
+        disk_kernel,
         /** There is an error but its type is unknown */ 
         // TODO: Remove this when all hosts in the node repo has a failure type
         unknown
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index 40f95021751..84012dd63b7 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -291,18 +291,18 @@ public class NodeSerializer {
 
     private Status.HardwareFailureType hardwareFailureFromString(String hardwareFailureString) {
         switch (hardwareFailureString) {
-            case "mce" : return Status.HardwareFailureType.mce;
-            case "smart" : return Status.HardwareFailureType.smart;
-            case "kernel" : return Status.HardwareFailureType.kernel;
+            case "memory_mcelog" : return Status.HardwareFailureType.memory_mcelog;
+            case "disk_smart" : return Status.HardwareFailureType.disk_smart;
+            case "disk_kernel" : return Status.HardwareFailureType.disk_kernel;
             case "unknown" : return Status.HardwareFailureType.unknown;
             default : throw new IllegalArgumentException("Unknown hardware failure '" + hardwareFailureString + "'");
         }
     }
     private String toString(Status.HardwareFailureType type) {
         switch (type) {
-            case mce: return "mce";
-            case smart: return "smart";
-            case kernel: return "kernel";
+            case memory_mcelog: return "memory_mcelog";
+            case disk_smart: return "disk_smart";
+            case disk_kernel: return "disk_kernel";
             case unknown: return "unknown";
             default : throw new IllegalArgumentException("Serialized form of '" + type + " not defined");
         }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
index d233af58e73..12321f45f22 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
@@ -115,9 +115,9 @@ public class NodePatcher {
 
     private Optional<Status.HardwareFailureType> toHardwareFailureType(String failureType) {
         switch (failureType) {
-            case "mce" : return Optional.of(Status.HardwareFailureType.mce);
-            case "smart" : return Optional.of(Status.HardwareFailureType.smart);
-            case "kernel" : return Optional.of(Status.HardwareFailureType.kernel);
+            case "memory_mcelog" : return Optional.of(Status.HardwareFailureType.memory_mcelog);
+            case "disk_smart" : return Optional.of(Status.HardwareFailureType.disk_smart);
+            case "disk_kernel" : return Optional.of(Status.HardwareFailureType.disk_kernel);
             case "unknown" : throw new IllegalArgumentException("An actual hardware failure type must be provided, not 'unknown'");
             default : throw new IllegalArgumentException("Unknown hardware failure '" + failureType + "'");
         }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
index 9983f2706bd..f5b8fa74419 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
@@ -230,9 +230,9 @@ class NodesResponse extends HttpResponse {
 
     private String toString(Status.HardwareFailureType type) {
         switch (type) {
-            case mce: return "mce";
-            case smart: return "smart";
-            case kernel: return "kernel";
+            case memory_mcelog: return "memory_mcelog";
+            case disk_smart: return "disk_smart";
+            case disk_kernel: return "disk_kernel";
             case unknown: return "unknown";
             default : throw new IllegalArgumentException("Serialized form of '" + type + " not defined");
         }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
index 4be148ccf97..ea8a6490cb4 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
@@ -88,7 +88,7 @@ public class FailedExpirerTest {
 
         // Set node2 to have a detected hardware failure
         Node node2 = nodeRepository.getNode("node2").get();
-        node2 = node2.setStatus(node2.status().setHardwareFailure(Optional.of(Status.HardwareFailureType.mce)));
+        node2 = node2.setStatus(node2.status().setHardwareFailure(Optional.of(Status.HardwareFailureType.memory_mcelog)));
         nodeRepository.write(node2);
 
         // Allocate the nodes
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
index 8c2e4d3c8f7..87e10dc0b15 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
@@ -149,8 +149,8 @@ public class NodeFailerTest {
         // Failures are detected on two ready nodes, which are then failed
         Node readyFail1 = nodeRepository.getNodes(Node.Type.tenant, Node.State.ready).get(2);
         Node readyFail2 = nodeRepository.getNodes(Node.Type.tenant, Node.State.ready).get(3);
-        nodeRepository.write(readyFail1.setStatus(readyFail1.status().setHardwareFailure(Optional.of(Status.HardwareFailureType.mce))));
-        nodeRepository.write(readyFail2.setStatus(readyFail2.status().setHardwareFailure(Optional.of(Status.HardwareFailureType.smart))));
+        nodeRepository.write(readyFail1.setStatus(readyFail1.status().setHardwareFailure(Optional.of(Status.HardwareFailureType.memory_mcelog))));
+        nodeRepository.write(readyFail2.setStatus(readyFail2.status().setHardwareFailure(Optional.of(Status.HardwareFailureType.disk_smart))));
         assertEquals(4, nodeRepository.getNodes(Node.Type.tenant, Node.State.ready).size());
         failer.run();
         assertEquals(2, nodeRepository.getNodes(Node.Type.tenant, Node.State.ready).size());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
index be45dfa152e..5200e4768a1 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
@@ -65,7 +65,7 @@ public class SerializationTest {
         node = node.setFlavor(FlavorConfigBuilder.createDummies("large").getFlavorOrThrow("large"));
         node = node.setStatus(node.status().setVespaVersion(Version.fromString("1.2.3")));
         node = node.setStatus(node.status().increaseFailCount().increaseFailCount());
-        node = node.setStatus(node.status().setHardwareFailure(Optional.of(Status.HardwareFailureType.mce)));
+        node = node.setStatus(node.status().setHardwareFailure(Optional.of(Status.HardwareFailureType.memory_mcelog)));
         node = node.setType(Node.Type.tenant);
         Node copy = nodeSerializer.fromJson(Node.State.provisioned, nodeSerializer.toJson(node));
 
@@ -79,7 +79,7 @@ public class SerializationTest {
         assertEquals("large", copy.configuration().flavor().name());
         assertEquals("1.2.3", copy.status().vespaVersion().get().toString());
         assertEquals(2, copy.status().failCount());
-        assertEquals(Status.HardwareFailureType.mce, copy.status().hardwareFailure().get());
+        assertEquals(Status.HardwareFailureType.memory_mcelog, copy.status().hardwareFailure().get());
         assertEquals(node.allocation().get().owner(), copy.allocation().get().owner());
         assertEquals(node.allocation().get().membership(), copy.allocation().get().membership());
         assertEquals(node.allocation().get().removable(), copy.allocation().get().removable());