diff options
author | Henning Baldersheim <balder@oath.com> | 2018-03-16 17:26:38 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-03-19 13:01:16 +0100 |
commit | 99c0278cfa2118fb26a4e13b8ede982cb6abf1fe (patch) | |
tree | b59e9977e37833da59d937b0244b3df0bf373406 /storageserver | |
parent | 2a788ec1b3900d7ba853b3f5f89e49df7e016c7e (diff) |
Clean out priority blocking stuff in PersistenceThread
Conflicts:
storage/src/tests/persistence/filestorage/filestormanagertest.cpp
Resolve merge conflict.
Diffstat (limited to 'storageserver')
-rw-r--r-- | storageserver/src/tests/storageservertest.cpp | 3 | ||||
-rw-r--r-- | storageserver/src/tests/testhelper.cpp | 23 |
2 files changed, 2 insertions, 24 deletions
diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp index 36d72bdc2b4..03b4dfd80da 100644 --- a/storageserver/src/tests/storageservertest.cpp +++ b/storageserver/src/tests/storageservertest.cpp @@ -222,8 +222,7 @@ StorageServerTest::setUp() storConfig.reset(new vdstestlib::DirConfig(getStandardConfig(true))); addSlobrokConfig(*distConfig, *slobrok); addSlobrokConfig(*storConfig, *slobrok); - storConfig->getConfig("stor-filestor") - .set("fail_disk_after_error_count", "1"); + storConfig->getConfig("stor-filestor").set("fail_disk_after_error_count", "1"); system("mkdir -p vdsroot/disks/d0"); system("mkdir -p vdsroot.distributor"); slobrokMirror.reset(new SlobrokMirror(slobrok->config())); diff --git a/storageserver/src/tests/testhelper.cpp b/storageserver/src/tests/testhelper.cpp index bcc5967215b..b245a6500bd 100644 --- a/storageserver/src/tests/testhelper.cpp +++ b/storageserver/src/tests/testhelper.cpp @@ -7,23 +7,6 @@ LOG_SETUP(".testhelper"); namespace storage { -namespace { - bool useNewStorageCore() { - if ( // Unit test directory - vespalib::fileExists("use_new_storage_core") || - // src/cpp directory - vespalib::fileExists("../use_new_storage_core") || - // Top build directory where storage-HEAD remains - vespalib::fileExists("../../../../../use_new_storage_core")) - { - std::cerr << "Using new storage core for unit tests\n"; - return true; - } - return false; - } - bool newStorageCore(useNewStorageCore()); -} - void addStorageDistributionConfig(vdstestlib::DirConfig& dc) { vdstestlib::DirConfig::Config* config; @@ -72,18 +55,13 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) { config->set("threads[0].lowestpri 255"); config->set("dir_spread", "4"); config->set("dir_levels", "0"); - config->set("use_new_core", newStorageCore ? "true" : "false"); config->set("maximum_versions_of_single_document_stored", "0"); //config->set("enable_slotfile_cache", "false"); // Unit tests typically use fake low time values, so don't complain // about them or compact/delete them by default. Override in tests testing that // behavior - config->set("time_future_limit", "5"); - config->set("time_past_limit", "2000000000"); config->set("keep_remove_time_period", "2000000000"); config->set("revert_time_period", "2000000000"); - // Don't want test to call exit() - config->set("fail_disk_after_error_count", "0"); config = &dc.addConfig("stor-memfilepersistence"); // Easier to see what goes wrong with only 1 thread per disk. config->set("minimum_file_meta_slots", "2"); @@ -94,6 +72,7 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) { config = &dc.addConfig("persistence"); config->set("keep_remove_time_period", "2000000000"); config->set("revert_time_period", "2000000000"); + config->set("fail_disk_after_error_count", "0"); config = &dc.addConfig("stor-bouncer"); config = &dc.addConfig("stor-integritychecker"); config = &dc.addConfig("stor-bucketmover"); |