diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-12-13 13:35:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-13 13:35:24 +0100 |
commit | 26d8b8f992c3c3b6bee102f3b6c4551f20b9aad7 (patch) | |
tree | 66b5029386a7ce394589e650ff17b5f110865aef /searchcore/src/tests/proton | |
parent | 4c4e2be6e6870db6c95c591108c4780da4696a66 (diff) |
Revert "Revert "Use the forward scheduler in proton also for disk-mem-util-sampler"""
Diffstat (limited to 'searchcore/src/tests/proton')
-rw-r--r-- | searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp b/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp index 0c06d27c916..5879eafd0d0 100644 --- a/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp +++ b/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/searchcore/proton/common/hw_info.h> +#include <vespa/searchcore/proton/common/scheduledexecutor.h> #include <vespa/searchcore/proton/common/i_transient_resource_usage_provider.h> #include <vespa/searchcore/proton/server/disk_mem_usage_sampler.h> #include <vespa/searchcore/proton/test/transport_helper.h> @@ -39,20 +40,23 @@ public: struct DiskMemUsageSamplerTest : public ::testing::Test { Transport transport; + ScheduledExecutor executor; std::unique_ptr<DiskMemUsageSampler> sampler; DiskMemUsageSamplerTest() : transport(), - sampler(std::make_unique<DiskMemUsageSampler>(transport.transport(), ".", DiskMemUsageSampler::Config(0.8, 0.8, 50ms, make_hw_info()))) + executor(transport.transport()), + sampler(std::make_unique<DiskMemUsageSampler>(".", make_hw_info())) { + sampler->setConfig(DiskMemUsageSampler::Config(0.8, 0.8, 50ms, make_hw_info()), executor); sampler->add_transient_usage_provider(std::make_shared<MyProvider>(50, 200)); sampler->add_transient_usage_provider(std::make_shared<MyProvider>(100, 150)); } - ~DiskMemUsageSamplerTest() { - sampler.reset(); - } + ~DiskMemUsageSamplerTest(); const DiskMemUsageFilter& filter() const { return sampler->writeFilter(); } }; +DiskMemUsageSamplerTest::~DiskMemUsageSamplerTest() = default; + TEST_F(DiskMemUsageSamplerTest, resource_usage_is_sampled) { // Poll for up to 20 seconds to get a sample. |