aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-11-22 09:50:54 +0100
committerGitHub <noreply@github.com>2021-11-22 09:50:54 +0100
commit3f26967eac3ebf0f84025659f8b721752d5a4b3b (patch)
treec8c04f7702ba014a962778de13ed38c582925944
parent6642c1e16a98b6bc8d94e6189613999e0e3eb4e9 (diff)
parent38fdcb1a225e68993460214d96f3b5a9839e5ce9 (diff)
Merge pull request #20139 from vespa-engine/mpolden/ignore-policies-without-zone
Ignore routing policy not supporting ALIAS
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
index 634d76c8449..d2dc2771160 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
@@ -230,6 +230,7 @@ public class RoutingPolicies {
for (var policy : routeEntry.getValue()) {
for (var target : endpoint.targets()) {
if (!policy.appliesTo(target.deployment())) continue;
+ if (policy.dnsZone().isEmpty()) continue; // Does not support ALIAS records
int weight = target.weight();
if (isConfiguredOut(policy, inactiveZones) && removableFromApplicationEndpoint(policy, application, targetWeights)) {
weight = 0;