diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-09-06 09:25:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-06 09:25:03 +0200 |
| commit | 3a65c54215207f160f76f414b03117f224d9dec0 (patch) | |
| tree | 5088465ca1d93f5736e115933aea83dbafd0aa4c /controller-server | |
| parent | b6e8c11f75baa6eaa9034737a34945b2ca4775cc (diff) | |
Revert "Clear target major"
Diffstat (limited to 'controller-server')
2 files changed, 0 insertions, 7 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index e20fea03ff9..047c059e9a6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -159,9 +159,6 @@ public class ApplicationController { controller.serviceRegistry().endpointCertificateProvider(), controller.serviceRegistry().endpointCertificateValidator()); - // TODO: remove after release - curator.clearTargetMajor(); - // Update serialization format of all applications Once.after(Duration.ofMinutes(1), () -> { Instant start = clock.instant(); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java index a7f6b847d72..38cea6f8cef 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java @@ -273,10 +273,6 @@ public class CuratorDb { curator.set(versionStatusPath(), asJson(versionStatusSerializer.toSlime(status))); } - public void clearTargetMajor() { - curator.delete(root.append("upgrader").append("targetMajorVersion")); - } - public VersionStatus readVersionStatus() { return readSlime(versionStatusPath()).map(versionStatusSerializer::fromSlime).orElseGet(VersionStatus::empty); } |