summaryrefslogtreecommitdiffstats
path: root/storage/src/tests/common
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahoo-inc.com>2017-08-30 13:49:05 +0000
committerTor Brede Vekterli <vekterli@yahoo-inc.com>2017-08-30 13:49:05 +0000
commit605a60c9a2c95d7a67e674995a455c5c5f7f3545 (patch)
treecf796cdd42f829a764fa3bcc3e2866047eebe2f2 /storage/src/tests/common
parent75e055d4bb57d3323038fca456b8ec963d1994f9 (diff)
Add backpressure to MergeThrottler with configurable timing
Diffstat (limited to 'storage/src/tests/common')
-rw-r--r--storage/src/tests/common/testhelper.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp
index fa85f4c6a45..296a9a3cc0f 100644
--- a/storage/src/tests/common/testhelper.cpp
+++ b/storage/src/tests/common/testhelper.cpp
@@ -150,6 +150,7 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & ro
config->set("enable_dead_lock_detector_warnings", "false");
config->set("max_merges_per_node", "25");
config->set("max_merge_queue_size", "20");
+ config->set("resource_exhaustion_merge_back_pressure_duration_secs", "15.0");
vespalib::string rootFolder = rootOfRoot + "_";
rootFolder += (storagenode ? "vdsroot" : "vdsroot.distributor");
config->set("root_folder", rootFolder);