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/src/tests/storageservertest.cpp | |
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/src/tests/storageservertest.cpp')
-rw-r--r-- | storageserver/src/tests/storageservertest.cpp | 3 |
1 files changed, 1 insertions, 2 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())); |