diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-12-13 09:46:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-13 09:46:19 +0100 |
commit | 0d6e7d3599dfc66277a184bde28009530edb0d30 (patch) | |
tree | b1a1c8527d822d8c2fd7da84e8830c7808763e6b /searchcore/src/tests | |
parent | edf5ace6b73cbfbfacffe302e6347d8abce7a368 (diff) |
Revert "Use the forward scheduler in proton also for disk-mem-util-sampler"
Diffstat (limited to 'searchcore/src/tests')
-rw-r--r-- | searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp | 12 |
1 files changed, 4 insertions, 8 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 5879eafd0d0..0c06d27c916 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,7 +1,6 @@ // 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> @@ -40,23 +39,20 @@ public: struct DiskMemUsageSamplerTest : public ::testing::Test { Transport transport; - ScheduledExecutor executor; std::unique_ptr<DiskMemUsageSampler> sampler; DiskMemUsageSamplerTest() : transport(), - executor(transport.transport()), - sampler(std::make_unique<DiskMemUsageSampler>(".", make_hw_info())) + sampler(std::make_unique<DiskMemUsageSampler>(transport.transport(), ".", DiskMemUsageSampler::Config(0.8, 0.8, 50ms, 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(); + ~DiskMemUsageSamplerTest() { + sampler.reset(); + } 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. |