Merge pull request #10769 from vespa-engine/hmusum/remove-feature-flag

Remove feature flag USE_DEDICATED_NODE_FOR_LOGSERVER

2 files changed, 0 insertions, 7 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 48f5618886b..9cba549838e 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
@@ -131,7 +131,6 @@ public class ModelContextImpl implements ModelContext {
         private final Set<ContainerEndpoint> endpoints;
         private final boolean isBootstrap;
         private final boolean isFirstTimeDeployment;
-        private final boolean useDedicatedNodeForLogserver;
         private final boolean useAdaptiveDispatch;
         private final Optional<TlsSecrets> tlsSecrets;
         private final double defaultTermwiseLimit;
@@ -162,8 +161,6 @@ public class ModelContextImpl implements ModelContext {
             this.endpoints = endpoints;
             this.isBootstrap = isBootstrap;
             this.isFirstTimeDeployment = isFirstTimeDeployment;
-            this.useDedicatedNodeForLogserver = Flags.USE_DEDICATED_NODE_FOR_LOGSERVER.bindTo(flagSource)
-                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.useAdaptiveDispatch = Flags.USE_ADAPTIVE_DISPATCH.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.tlsSecrets = tlsSecrets;
@@ -212,9 +209,6 @@ public class ModelContextImpl implements ModelContext {
         public boolean isFirstTimeDeployment() { return isFirstTimeDeployment; }
 
         @Override
-        public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; }
-
-        @Override
         public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; }
 
         @Override
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 860bbdc134c..3102163df0d 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
@@ -81,6 +81,5 @@ public class ModelContextImplTest {
         assertThat(context.properties().rotations(), equalTo(rotations));
         assertThat(context.properties().endpoints(), equalTo(endpoints));
         assertThat(context.properties().isFirstTimeDeployment(), equalTo(false));
-        assertThat(context.properties().useDedicatedNodeForLogserver(), equalTo(true));
     }
 }