From 3578ae64641d6a3fb412d6ca1516e3cec0ac70e3 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Wed, 12 Jan 2022 14:46:54 +0000 Subject: Set defaults in config defs and ModelContext api to improve bucket merge performance on content nodes. These are the same defaults set for the feature flags in https://github.com/vespa-engine/vespa/pull/20759. --- .../com/yahoo/config/model/deploy/TestProperties.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'config-model/src/main/java/com/yahoo/config') 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 0007fa0d18a..3a3df4224b1 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 @@ -40,9 +40,9 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private boolean useThreePhaseUpdates = false; private double defaultTermwiseLimit = 1.0; private String jvmGCOptions = null; - private String sequencerType = "LATENCY"; + private String sequencerType = "THROUGHPUT"; private int feedTaskLimit = 1000; - private int feedMasterTaskLimit = 0; + private int feedMasterTaskLimit = 1000; private String sharedFieldWriterExecutor = "NONE"; private boolean firstTimeDeployment = false; private String responseSequencerType = "ADAPTIVE"; @@ -57,8 +57,8 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private List tenantSecretStores = Collections.emptyList(); private String jvmOmitStackTraceInFastThrowOption; private int maxConcurrentMergesPerNode = 16; - private int maxMergeQueueSize = 1024; - private boolean ignoreMergeQueueLimit = false; + private int maxMergeQueueSize = 100; + private boolean ignoreMergeQueueLimit = true; private boolean allowDisableMtls = true; private List operatorCertificates = Collections.emptyList(); private double resourceLimitDisk = 0.8; @@ -66,13 +66,13 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private double minNodeRatioPerGroup = 0.0; private boolean containerDumpHeapOnShutdownTimeout = false; private double containerShutdownTimeout = 50.0; - private int distributorMergeBusyWait = 10; + private int distributorMergeBusyWait = 1; private int docstoreCompressionLevel = 9; private int maxUnCommittedMemory = 123456; private double diskBloatFactor = 0.25; - private boolean distributorEnhancedMaintenanceScheduling = false; - private boolean asyncApplyBucketDiff = false; - private boolean unorderedMergeChaining = false; + private boolean distributorEnhancedMaintenanceScheduling = true; + private boolean asyncApplyBucketDiff = true; + private boolean unorderedMergeChaining = true; private List zoneDnsSuffixes = List.of(); private int maxCompactBuffers = 1; private boolean failDeploymentWithInvalidJvmOptions = false; -- cgit v1.2.3