Merge branch 'master' into balder/gc-unused-phrase-flags

1 files changed, 0 insertions, 62 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index b1b6870a004..eb628db6975 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -54,8 +54,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private int maxActivationInhibitedOutOfSyncGroups = 0;
     private List<TenantSecretStore> tenantSecretStores = Collections.emptyList();
     private String jvmOmitStackTraceInFastThrowOption;
-    private int maxConcurrentMergesPerNode = 16;
-    private int maxMergeQueueSize = 100;
     private boolean allowDisableMtls = true;
     private List<X509Certificate> operatorCertificates = Collections.emptyList();
     private double resourceLimitDisk = 0.75;
@@ -64,15 +62,8 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private boolean containerDumpHeapOnShutdownTimeout = false;
     private double containerShutdownTimeout = 50.0;
     private int maxUnCommittedMemory = 123456;
-    private boolean unorderedMergeChaining = true;
     private List<String> zoneDnsSuffixes = List.of();
     private int maxCompactBuffers = 1;
-    private String mergeThrottlingPolicy = "STATIC";
-    private double persistenceThrottlingWsDecrementFactor = 1.2;
-    private double persistenceThrottlingWsBackoff = 0.95;
-    private int persistenceThrottlingWindowSize = -1;
-    private double persistenceThrottlingWsResizeRate = 3.0;
-    private boolean persistenceThrottlingOfMergeFeedOps = true;
     private boolean useV8GeoPositions = true;
     private List<String> environmentVariables = List.of();
     private boolean loadCodeAsHugePages = false;
@@ -117,23 +108,14 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public String jvmOmitStackTraceInFastThrowOption(ClusterSpec.Type type) { return jvmOmitStackTraceInFastThrowOption; }
     @Override public boolean allowDisableMtls() { return allowDisableMtls; }
     @Override public List<X509Certificate> operatorCertificates() { return operatorCertificates; }
-    @Override public int maxConcurrentMergesPerNode() { return maxConcurrentMergesPerNode; }
-    @Override public int maxMergeQueueSize() { return maxMergeQueueSize; }
     @Override public double resourceLimitDisk() { return resourceLimitDisk; }
     @Override public double resourceLimitMemory() { return resourceLimitMemory; }
     @Override public double minNodeRatioPerGroup() { return minNodeRatioPerGroup; }
     @Override public double containerShutdownTimeout() { return containerShutdownTimeout; }
     @Override public boolean containerDumpHeapOnShutdownTimeout() { return containerDumpHeapOnShutdownTimeout; }
     @Override public int maxUnCommittedMemory() { return maxUnCommittedMemory; }
-    @Override public boolean unorderedMergeChaining() { return unorderedMergeChaining; }
     @Override public List<String> zoneDnsSuffixes() { return zoneDnsSuffixes; }
     @Override public int maxCompactBuffers() { return maxCompactBuffers; }
-    @Override public String mergeThrottlingPolicy() { return mergeThrottlingPolicy; }
-    @Override public double persistenceThrottlingWsDecrementFactor() { return persistenceThrottlingWsDecrementFactor; }
-    @Override public double persistenceThrottlingWsBackoff() { return persistenceThrottlingWsBackoff; }
-    @Override public int persistenceThrottlingWindowSize() { return persistenceThrottlingWindowSize; }
-    @Override public double persistenceThrottlingWsResizeRate() { return persistenceThrottlingWsResizeRate; }
-    @Override public boolean persistenceThrottlingOfMergeFeedOps() { return persistenceThrottlingOfMergeFeedOps; }
     @Override public boolean useV8GeoPositions() { return useV8GeoPositions; }
     @Override public List<String> environmentVariables() { return environmentVariables; }
     @Override public Architecture adminClusterArchitecture() { return adminClusterNodeResourcesArchitecture; }
@@ -214,15 +196,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties setMaxConcurrentMergesPerNode(int maxConcurrentMergesPerNode) {
-        this.maxConcurrentMergesPerNode = maxConcurrentMergesPerNode;
-        return this;
-    }
-    public TestProperties setMaxMergeQueueSize(int maxMergeQueueSize) {
-        this.maxMergeQueueSize = maxMergeQueueSize;
-        return this;
-    }
-
     public TestProperties setDefaultTermwiseLimit(double limit) {
         defaultTermwiseLimit = limit;
         return this;
@@ -313,11 +286,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties setUnorderedMergeChaining(boolean unordered) {
-        unorderedMergeChaining = unordered;
-        return this;
-    }
-
     public TestProperties setZoneDnsSuffixes(List<String> zoneDnsSuffixes) {
         this.zoneDnsSuffixes = List.copyOf(zoneDnsSuffixes);
         return this;
@@ -328,36 +296,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties setMergeThrottlingPolicy(String policy) {
-        this.mergeThrottlingPolicy = policy;
-        return this;
-    }
-
-    public TestProperties setPersistenceThrottlingWsDecrementFactor(double factor) {
-        this.persistenceThrottlingWsDecrementFactor = factor;
-        return this;
-    }
-
-    public TestProperties setPersistenceThrottlingWsBackoff(double backoff) {
-        this.persistenceThrottlingWsBackoff = backoff;
-        return this;
-    }
-
-    public TestProperties setPersistenceThrottlingWindowSize(int windowSize) {
-        this.persistenceThrottlingWindowSize = windowSize;
-        return this;
-    }
-
-    public TestProperties setPersistenceThrottlingWsResizeRate(double resizeRate) {
-        this.persistenceThrottlingWsResizeRate = resizeRate;
-        return this;
-    }
-
-    public TestProperties setPersistenceThrottlingOfMergeFeedOps(boolean throttleOps) {
-        this.persistenceThrottlingOfMergeFeedOps = throttleOps;
-        return this;
-    }
-
     public TestProperties setUseV8GeoPositions(boolean value) {
         this.useV8GeoPositions = value;
         return this;