Add feature flag for using dedicated node for logserver (#7023)

4 files changed, 14 insertions, 4 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 914d6963ff0..acf49fe51be 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
@@ -125,6 +125,7 @@ public class ModelContextImpl implements ModelContext {
         private final Set<Rotation> rotations;
         private final boolean isBootstrap;
         private final boolean isFirstTimeDeployment;
+        private final boolean useDedicatedNodeForLogserver;
 
         public Properties(ApplicationId applicationId,
                           boolean multitenant,
@@ -136,7 +137,8 @@ public class ModelContextImpl implements ModelContext {
                           Zone zone,
                           Set<Rotation> rotations,
                           boolean isBootstrap,
-                          boolean isFirstTimeDeployment) {
+                          boolean isFirstTimeDeployment,
+                          boolean useDedicatedNodeForLogserver) {
             this.applicationId = applicationId;
             this.multitenant = multitenant;
             this.configServerSpecs = configServerSpecs;
@@ -148,6 +150,7 @@ public class ModelContextImpl implements ModelContext {
             this.rotations = rotations;
             this.isBootstrap = isBootstrap;
             this.isFirstTimeDeployment = isFirstTimeDeployment;
+            this.useDedicatedNodeForLogserver = useDedicatedNodeForLogserver;
         }
 
         @Override
@@ -186,6 +189,9 @@ public class ModelContextImpl implements ModelContext {
 
         @Override
         public boolean isFirstTimeDeployment() { return isFirstTimeDeployment; }
+
+        @Override
+        public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; }
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
index c18d3c7fe48..0ebb83f5cd1 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
@@ -115,7 +115,8 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
                                                zone(),
                                                new Rotations(curator, TenantRepository.getTenantPath(tenant)).readRotationsFromZooKeeper(applicationId),
                                                false, // We may be bootstrapping, but we only know and care during prepare
-                                               false); // Always false, assume no one uses it when activating
+                                               false, // Always false, assume no one uses it when activating
+                                               configserverConfig.useDedicatedNodeForLogserver());
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 49287669a06..4edde0904a4 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -159,7 +159,8 @@ public class SessionPreparer {
                                                               zone,
                                                               rotationsSet,
                                                               params.isBootstrap(),
-                                                              ! currentActiveApplicationSet.isPresent());
+                                                              ! currentActiveApplicationSet.isPresent(),
+                                                              configserverConfig.useDedicatedNodeForLogserver());
             this.preparedModelsBuilder = new PreparedModelsBuilder(modelFactoryRegistry,
                                                                    permanentApplicationPackage,
                                                                    configDefinitionRepo,
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
index 28fc179770a..43425aec13b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
- * @author lulf
+ * @author Ulf Lilleengen
  */
 public class ModelContextImplTest {
     @Test
@@ -52,6 +52,7 @@ public class ModelContextImplTest {
                         Zone.defaultZone(),
                         rotations,
                         false,
+                        false,
                         false),
                 Optional.empty(),
                 new Version(6), 
@@ -69,5 +70,6 @@ public class ModelContextImplTest {
         assertFalse(context.properties().hostedVespa());
         assertThat(context.properties().rotations(), equalTo(rotations));
         assertThat(context.properties().isFirstTimeDeployment(), equalTo(false));
+        assertThat(context.properties().useDedicatedNodeForLogserver(), equalTo(false));
     }
 }