- Reorder to cancel the recurring task.

- Add and explicit close.

3 files changed, 6 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 5879eafd0d0..d01e9f8fc5f 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
@@ -55,7 +55,9 @@ struct DiskMemUsageSamplerTest : public ::testing::Test {
     const DiskMemUsageFilter& filter() const { return sampler->writeFilter(); }
 };
 
-DiskMemUsageSamplerTest::~DiskMemUsageSamplerTest() = default;
+DiskMemUsageSamplerTest::~DiskMemUsageSamplerTest() {
+    sampler->close(); // Ensure all tasks are stopped
+}
 
 TEST_F(DiskMemUsageSamplerTest, resource_usage_is_sampled)
 {
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
index 4e900c83821..f2fae014f0f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
@@ -16,8 +16,8 @@ DiskMemUsageSampler::DiskMemUsageSampler(const std::string &path_in, const HwInf
       _sampleInterval(60s),
       _lastSampleTime(),
       _lock(),
-      _periodicHandle(),
-      _transient_usage_providers()
+      _transient_usage_providers(),
+      _periodicHandle()
 {
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
index ed0853ac100..16c89a253fd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
@@ -20,8 +20,8 @@ class DiskMemUsageSampler {
     vespalib::duration     _sampleInterval;
     vespalib::steady_time  _lastSampleTime;
     std::mutex             _lock;
-    std::unique_ptr<vespalib::IDestructorCallback> _periodicHandle;
     std::vector<std::shared_ptr<const ITransientResourceUsageProvider>> _transient_usage_providers;
+    std::unique_ptr<vespalib::IDestructorCallback> _periodicHandle;
 
     void sampleAndReportUsage();
     uint64_t sampleDiskUsage();