Remove old convergence summary field

2 files changed, 4 insertions, 26 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java
index 91d85e62fcb..60d8afe0f5e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java
@@ -95,7 +95,6 @@ class RunSerializer {
     private static final String lastTestRecordField = "lastTestRecord";
     private static final String lastVespaLogTimestampField = "lastVespaLogTimestamp";
     private static final String noNodesDownSinceField = "noNodesDownSince";
-    private static final String oldConvergenceSummaryField = "convergenceSummary"; // TODO (freva): Remove after 7.410
     private static final String convergenceSummaryField = "convergenceSummaryV2";
     private static final String testerCertificateField = "testerCertificate";
 
@@ -137,8 +136,7 @@ class RunSerializer {
                        runObject.field(lastTestRecordField).asLong(),
                        Instant.EPOCH.plus(runObject.field(lastVespaLogTimestampField).asLong(), ChronoUnit.MICROS),
                        Serializers.optionalInstant(runObject.field(noNodesDownSinceField)),
-                       convergenceSummaryFrom(runObject.field(convergenceSummaryField))
-                               .or(() ->convergenceSummaryFrom(runObject.field(oldConvergenceSummaryField))),
+                       convergenceSummaryFrom(runObject.field(convergenceSummaryField)),
                        Optional.of(runObject.field(testerCertificateField))
                                .filter(Inspector::valid)
                                .map(certificate -> X509CertificateUtils.fromPem(certificate.asString())));
@@ -223,10 +221,7 @@ class RunSerializer {
         runObject.setLong(lastTestRecordField, run.lastTestLogEntry());
         runObject.setLong(lastVespaLogTimestampField, Instant.EPOCH.until(run.lastVespaLogTimestamp(), ChronoUnit.MICROS));
         run.noNodesDownSince().ifPresent(noNodesDownSince -> runObject.setLong(noNodesDownSinceField, noNodesDownSince.toEpochMilli()));
-        run.convergenceSummary().ifPresent(convergenceSummary -> {
-            toSlime(convergenceSummary, runObject.setArray(convergenceSummaryField), false);
-            toSlime(convergenceSummary, runObject.setArray(oldConvergenceSummaryField), true);
-        });
+        run.convergenceSummary().ifPresent(convergenceSummary -> toSlime(convergenceSummary, runObject.setArray(convergenceSummaryField)));
         run.testerCertificate().ifPresent(certificate -> runObject.setString(testerCertificateField, X509CertificateUtils.toPem(certificate)));
 
         Cursor stepsObject = runObject.setObject(stepsField);
@@ -263,7 +258,7 @@ class RunSerializer {
     }
 
     // Don't change this - introduce a separate array with new values if needed.
-    private void toSlime(ConvergenceSummary summary, Cursor summaryArray, boolean oldFormat) {
+    private void toSlime(ConvergenceSummary summary, Cursor summaryArray) {
         summaryArray.addLong(summary.nodes());
         summaryArray.addLong(summary.down());
         summaryArray.addLong(summary.upgradingOs());
@@ -276,8 +271,7 @@ class RunSerializer {
         summaryArray.addLong(summary.restarting());
         summaryArray.addLong(summary.services());
         summaryArray.addLong(summary.needNewConfig());
-        if (!oldFormat)
-            summaryArray.addLong(summary.retiring());
+        summaryArray.addLong(summary.retiring());
     }
 
     static String valueOf(Step step) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java
index 8df2fd87398..6e12373640d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java
@@ -19,14 +19,12 @@ import com.yahoo.vespa.hosted.controller.deployment.StepInfo;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.Optional;
-import java.util.function.BiConsumer;
 
 import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.aborted;
 import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.running;
@@ -155,18 +153,4 @@ public class RunSerializerTest {
         assertEquals(initial, serializer.runFromSlime(serializer.toSlime(initial)));
     }
 
-    @Test
-    public void convergenceSummaryMigrationTest() throws IOException {
-        String data = Files.readString(runFile);
-        BiConsumer<String, ConvergenceSummary> replaceAndAssert = (replace, convergenceSummaryOrNull) -> {
-            byte[] newData = data.replace("\"convergenceSummaryV2\": [1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233],", replace).getBytes(StandardCharsets.UTF_8);
-            assertEquals(convergenceSummaryOrNull, serializer.runsFromSlime(SlimeUtils.jsonToSlime(newData)).get(id).convergenceSummary().orElse(null));
-        };
-
-        replaceAndAssert.accept("", null);
-        replaceAndAssert.accept("\"convergenceSummary\": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],", new ConvergenceSummary(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0));
-        replaceAndAssert.accept("\"convergenceSummaryV2\": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13],\n" +
-                                "\"convergenceSummary\": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],", new ConvergenceSummary(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13));
-    }
-
 }