From 7e293bf5a38917233801a816ea15282c6d09e11b Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Thu, 27 May 2021 13:45:25 +0200 Subject: Implement HostEncrypter --- flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'flags') diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 4f1002b91a7..ff5aa450bb1 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -252,6 +252,12 @@ public class Flags { "Takes effect on next deployment through controller", APPLICATION_ID); + public static final UnboundIntFlag MAX_ENCRYPTING_HOSTS = defineIntFlag( + "max-encrypting-hosts", 0, + List.of("mpolden", "hakonhall"), "2021-05-27", "2021-10-01", + "The maximum number of hosts allowed to encrypt their disk concurrently", + "Takes effect immediately, but any currently encrypting hosts will not be cancelled when reducing the limit"); + /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List owners, String createdAt, String expiresAt, String description, -- cgit v1.2.3 From 33d8403731945563c1d011f88475579a9bb9d3a2 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Thu, 27 May 2021 14:17:32 +0200 Subject: Fix descriptions --- flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 +- .../src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'flags') diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index ff5aa450bb1..c052ccc5ffc 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -256,7 +256,7 @@ public class Flags { "max-encrypting-hosts", 0, List.of("mpolden", "hakonhall"), "2021-05-27", "2021-10-01", "The maximum number of hosts allowed to encrypt their disk concurrently", - "Takes effect immediately, but any currently encrypting hosts will not be cancelled when reducing the limit"); + "Takes effect on next run of HostEncrypter, but any currently encrypting hosts will not be cancelled when reducing the limit"); /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List owners, diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java index 04f7111af2a..59cee0a469e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java @@ -640,7 +640,7 @@ public class Nodes { nodeLock)); Node newHost = host.withWantToRetire(true, wantToDeprovision, wantToRebuild, agent, instant); if (op == DecommissionOperation.encrypt) { - Report report = Report.basicReport(Report.WANT_TO_ENCRYPT_ID, Report.Type.UNSPECIFIED, instant, "Host should be encrypted"); + Report report = Report.basicReport(Report.WANT_TO_ENCRYPT_ID, Report.Type.UNSPECIFIED, instant, ""); newHost = newHost.with(newHost.reports().withReport(report)); } result.add(write(newHost, lock)); -- cgit v1.2.3