diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-08-09 09:13:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-09 09:13:55 +0200 |
commit | 9697636fb3e86c025d4e636ef5958e7585620a1a (patch) | |
tree | e82248cab0f2dc28d1d5460915585162e67b425d | |
parent | f9188ae7a9c9eac41506a3f8fc99d5efed86b5c3 (diff) | |
parent | ea79f0919f4e67a0c335b4ff1855defefc459fb8 (diff) |
Merge pull request #27986 from vespa-engine/hakonhall/include-prodcontroller-in-zone-set
Include prod.controller in zone set
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java index 9426952f57e..577769baf1e 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java @@ -182,7 +182,9 @@ public class SystemFlagsDataArchive { if (rawData.isBlank()) { flagData = new FlagData(directoryDeducedFlagId); } else { - Set<ZoneId> zones = force ? zoneRegistry.zones().all().zones().stream().map(ZoneApi::getVirtualId).collect(Collectors.toSet()) + Set<ZoneId> zones = force ? Stream.concat(Stream.of(ZoneId.ofVirtualControllerZone()), + zoneRegistry.zones().all().zones().stream().map(ZoneApi::getVirtualId)) + .collect(Collectors.toSet()) : Set.of(); String normalizedRawData = normalizeJson(rawData, zones); flagData = FlagData.deserialize(normalizedRawData); |