diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-11 13:06:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-11 13:06:29 +0100 |
commit | cd96624e88a7a21ee0f5f49f06acde9a5122fab0 (patch) | |
tree | 15b9ab6e84dc39783e928f8d22d45f714d746ec5 | |
parent | 43d350047e8c7ba83fd3d5d671f16ca23b089fdb (diff) | |
parent | d476e60baae67cbd39c904823f065c768af84016 (diff) |
Merge pull request #15984 from vespa-engine/bjorncs/cleanup
Remove old feature flag getters from ModelContext.Properties
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 15 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 46 |
2 files changed, 0 insertions, 61 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 18dcba02dff..52ebed0766c 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -115,21 +115,6 @@ public interface ModelContext { // TODO(somebody): Only needed for LbServicesProducerTest default boolean useDedicatedNodeForLogserver() { return true; } - // NOTE: Use FeatureFlags interface above instead of non-permanent flags - @Deprecated double defaultTermwiseLimit(); - @Deprecated default int defaultNumResponseThreads() { return 2; } - @Deprecated String feedSequencerType(); - @Deprecated String responseSequencerType(); - @Deprecated boolean skipCommunicationManagerThread(); - @Deprecated boolean skipMbusRequestThread(); - @Deprecated boolean skipMbusReplyThread(); - @Deprecated boolean useAsyncMessageHandlingOnSchedule(); - @Deprecated int contentNodeBucketDBStripeBits(); - @Deprecated int mergeChunkSize(); - @Deprecated double feedConcurrency(); - @Deprecated boolean useThreePhaseUpdates(); - @Deprecated default boolean useDirectStorageApiRpc() { return true; } - @Deprecated default boolean useAccessControlTlsHandshakeClientAuth() { return false; } } @Retention(RetentionPolicy.RUNTIME) 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 40fbfe9ece8..2188fc0acf3 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 @@ -208,7 +208,6 @@ public class ModelContextImpl implements ModelContext { } - @SuppressWarnings("deprecation") // for old feature flag methods in ModelContext.Properties public static class Properties implements ModelContext.Properties { private final ModelContext.FeatureFlags featureFlags; @@ -230,21 +229,6 @@ public class ModelContextImpl implements ModelContext { private final String jvmGCOPtions; - // Old non-permanent feature flags. Use ModelContext.FeatureFlag instead - private final double defaultTermwiseLimit; - private final boolean useThreePhaseUpdates; - private final String feedSequencer; - private final String responseSequencer; - private final int numResponseThreads; - private final boolean skipCommunicationManagerThread; - private final boolean skipMbusRequestThread; - private final boolean skipMbusReplyThread; - private final boolean useAccessControlTlsHandshakeClientAuth; - private final boolean useAsyncMessageHandlingOnSchedule; - private final int contentNodeBucketDBStripeBits; - private final int mergeChunkSize; - private final double feedConcurrency; - public Properties(ApplicationId applicationId, ConfigserverConfig configserverConfig, Zone zone, @@ -274,21 +258,6 @@ public class ModelContextImpl implements ModelContext { this.quota = maybeQuota.orElseGet(Quota::unlimited); jvmGCOPtions = flagValue(flagSource, applicationId, PermanentFlags.JVM_GC_OPTIONS); - - // Old non-permanent feature flags. Use ModelContext.FeatureFlag instead - defaultTermwiseLimit = flagValue(flagSource, applicationId, Flags.DEFAULT_TERM_WISE_LIMIT); - useThreePhaseUpdates = flagValue(flagSource, applicationId, Flags.USE_THREE_PHASE_UPDATES); - feedSequencer = flagValue(flagSource, applicationId, Flags.FEED_SEQUENCER_TYPE); - responseSequencer = flagValue(flagSource, applicationId, Flags.RESPONSE_SEQUENCER_TYPE); - numResponseThreads = flagValue(flagSource, applicationId, Flags.RESPONSE_NUM_THREADS); - skipCommunicationManagerThread = flagValue(flagSource, applicationId, Flags.SKIP_COMMUNICATIONMANAGER_THREAD); - skipMbusRequestThread = flagValue(flagSource, applicationId, Flags.SKIP_MBUS_REQUEST_THREAD); - skipMbusReplyThread = flagValue(flagSource, applicationId, Flags.SKIP_MBUS_REPLY_THREAD); - this.useAccessControlTlsHandshakeClientAuth = flagValue(flagSource, applicationId, Flags.USE_ACCESS_CONTROL_CLIENT_AUTHENTICATION); - useAsyncMessageHandlingOnSchedule = flagValue(flagSource, applicationId, Flags.USE_ASYNC_MESSAGE_HANDLING_ON_SCHEDULE); - contentNodeBucketDBStripeBits = flagValue(flagSource, applicationId, Flags.CONTENT_NODE_BUCKET_DB_STRIPE_BITS); - mergeChunkSize = flagValue(flagSource, applicationId, Flags.MERGE_CHUNK_SIZE); - feedConcurrency = flagValue(flagSource, applicationId, Flags.FEED_CONCURRENCY); } @Override public ModelContext.FeatureFlags featureFlags() { return featureFlags; } @@ -345,21 +314,6 @@ public class ModelContextImpl implements ModelContext { @Override public String jvmGCOptions() { return jvmGCOPtions; } - // Old non-permanent feature flags. Use ModelContext.FeatureFlag instead - @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; } - @Override public boolean useThreePhaseUpdates() { return useThreePhaseUpdates; } - @Override public String feedSequencerType() { return feedSequencer; } - @Override public String responseSequencerType() { return responseSequencer; } - @Override public int defaultNumResponseThreads() { return numResponseThreads; } - @Override public boolean skipCommunicationManagerThread() { return skipCommunicationManagerThread; } - @Override public boolean skipMbusRequestThread() { return skipMbusRequestThread; } - @Override public boolean skipMbusReplyThread() { return skipMbusReplyThread; } - @Override public boolean useAccessControlTlsHandshakeClientAuth() { return useAccessControlTlsHandshakeClientAuth; } - @Override public boolean useAsyncMessageHandlingOnSchedule() { return useAsyncMessageHandlingOnSchedule; } - @Override public int contentNodeBucketDBStripeBits() { return contentNodeBucketDBStripeBits; } - @Override public int mergeChunkSize() { return mergeChunkSize; } - @Override public double feedConcurrency() { return feedConcurrency; } - private static <V> V flagValue(FlagSource source, ApplicationId appId, UnboundFlag<? extends V, ?, ?> flag) { return flag.bindTo(source) .with(FetchVector.Dimension.APPLICATION_ID, appId.serializedForm()) |