diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-02-01 09:40:18 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-02-01 09:40:18 +0100 |
commit | 7e05c8b5c653112a851077c3d945e9ee702f84d2 (patch) | |
tree | c52b504161cdf1131c829cd7491d50a380379449 | |
parent | aee4a604fb2f53acbf2790e75310023c0bf70492 (diff) |
Control by application.
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 4 | ||||
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 632ae4a03a1..870a91f8b45 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -160,7 +160,7 @@ public class ModelContextImpl implements ModelContext { this.useFdispatchByDefault = Flags.USE_FDISPATCH_BY_DEFAULT.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.useAdaptiveDispatch = Flags.USE_ADAPTIVE_DISPATCH.bindTo(flagSource) - .with(FetchVector.Dimension.ZONE_ID, zone.toString()).value(); + .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); } @Override @@ -206,7 +206,7 @@ public class ModelContextImpl implements ModelContext { @Override public boolean useFdispatchByDefault() { return useFdispatchByDefault; } @Override - public boolean useAdaptiveDispatch() { return useFdispatchByDefault; } + public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } } } 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 23151d3d1d1..1f260e9d158 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -94,7 +94,7 @@ public class Flags { "use-adaptive-dispatch", false, "Should adaptive dispatch be used over round robin", "Takes effect at redeployment", - ZONE_ID); + APPLICATION_ID); /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description, |