Add a flag to control default dispatch policy per zone.

1 files changed, 5 insertions, 0 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 658ffc55772..632ae4a03a1 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
@@ -130,6 +130,7 @@ public class ModelContextImpl implements ModelContext {
         private final boolean isFirstTimeDeployment;
         private final boolean useDedicatedNodeForLogserver;
         private final boolean useFdispatchByDefault;
+        private final boolean useAdaptiveDispatch;
 
         public Properties(ApplicationId applicationId,
                           boolean multitenantFromConfig,
@@ -158,6 +159,8 @@ public class ModelContextImpl implements ModelContext {
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             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();
         }
 
         @Override
@@ -202,6 +205,8 @@ public class ModelContextImpl implements ModelContext {
 
         @Override
         public boolean useFdispatchByDefault() { return useFdispatchByDefault; }
+        @Override
+        public boolean useAdaptiveDispatch() { return useFdispatchByDefault; }
     }
 
 }