diff options
| author | Tor Brede Vekterli <vekterli@vespa.ai> | 2023-10-23 10:00:57 +0000 |
|---|---|---|
| committer | Tor Brede Vekterli <vekterli@vespa.ai> | 2023-10-23 15:14:20 +0000 |
| commit | 8aae2bb96d56a1f4389ba3c67191445ecdd6921e (patch) | |
| tree | 7eb3bfb334ca37eafb0da818a762f7f20cb38659 /storageserver/src/tests/storageservertest.cpp | |
| parent | 0c603b5bbffa9bb0293a487d8c9c0145205b11f9 (diff) | |
Propagate existing StorageNode config from main Process reconfig loop
Diffstat (limited to 'storageserver/src/tests/storageservertest.cpp')
| -rw-r--r-- | storageserver/src/tests/storageservertest.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp index 2633449f28a..b18b241acaa 100644 --- a/storageserver/src/tests/storageservertest.cpp +++ b/storageserver/src/tests/storageservertest.cpp @@ -43,7 +43,7 @@ struct Node { struct Distributor : public Node { DistributorProcess _process; - Distributor(vdstestlib::DirConfig& config); + explicit Distributor(vdstestlib::DirConfig& config); ~Distributor() override; StorageNode& getNode() override { return _process.getNode(); } @@ -54,7 +54,7 @@ struct Storage : public Node { DummyServiceLayerProcess _process; StorageComponent::UP _component; - Storage(vdstestlib::DirConfig& config); + explicit Storage(vdstestlib::DirConfig& config); ~Storage() override; StorageNode& getNode() override { return _process.getNode(); } @@ -75,8 +75,7 @@ Storage::Storage(vdstestlib::DirConfig& config) { _process.setupConfig(60000ms); _process.createNode(); - _component = std::make_unique<StorageComponent>( - getContext().getComponentRegister(), "test"); + _component = std::make_unique<StorageComponent>(getContext().getComponentRegister(), "test"); } Storage::~Storage() = default; @@ -93,7 +92,6 @@ StorageServerTest::SetUp() storConfig = std::make_unique<vdstestlib::DirConfig>(getStandardConfig(true)); addSlobrokConfig(*distConfig, *slobrok); addSlobrokConfig(*storConfig, *slobrok); - storConfig->getConfig("stor-filestor").set("fail_disk_after_error_count", "1"); systemResult = system("mkdir -p vdsroot/disks/d0"); systemResult = system("mkdir -p vdsroot.distributor"); } @@ -101,6 +99,7 @@ StorageServerTest::SetUp() void StorageServerTest::TearDown() { + // TODO wipe temp dirs storConfig.reset(nullptr); distConfig.reset(nullptr); slobrok.reset(nullptr); |