Refcount must have longer lifetime than master executor.

3 files changed, 7 insertions, 5 deletions

diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp
index e844047f686..8dcad91f69a 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp
@@ -37,12 +37,12 @@ struct ControllerFixtureBase : public ::testing::Test
     MySubDb                     _notReady;
     BucketCreateNotifier        _bucketCreateNotifier;
     test::DiskMemUsageNotifier  _diskMemUsageNotifier;
+    MonitoredRefCount           _refCount;
     ThreadStackExecutor         _singleExecutor;
     ExecutorThreadService       _master;
     DummyBucketExecutor         _bucketExecutor;
     MyMoveHandler               _moveHandler;
     DocumentDBTaggedMetrics     _metrics;
-    MonitoredRefCount           _refCount;
     std::shared_ptr<BucketMoveJobV2>  _bmj;
     MyCountJobRunner            _runner;
     ControllerFixtureBase(const BlockableMaintenanceJobConfig &blockableConfig, bool storeMoveDoneContexts);
@@ -119,6 +119,7 @@ ControllerFixtureBase::ControllerFixtureBase(const BlockableMaintenanceJobConfig
       _notReady(_builder.getRepo(), _bucketDB, 2, SubDbType::NOTREADY),
       _bucketCreateNotifier(),
       _diskMemUsageNotifier(),
+      _refCount(),
       _singleExecutor(1, 0x10000),
       _master(_singleExecutor),
       _bucketExecutor(4),
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
index 8386385e7b2..04650ad7086 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
@@ -28,11 +28,12 @@ struct MyCountJobRunner : public IMaintenanceJobRunner {
 };
 
 JobTestBase::JobTestBase()
-    : _handler(),
+    : _refCount(),
+      _clusterStateHandler(),
+      _handler(),
       _storer(),
       _frozenHandler(),
       _diskMemUsageNotifier(),
-      _clusterStateHandler(),
       _job()
 {
     init(ALLOWED_LID_BLOAT, ALLOWED_LID_BLOAT_FACTOR, RESOURCE_LIMIT_FACTOR, JOB_DELAY, false, MAX_OUTSTANDING_MOVE_OPS);
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h
index e74167db189..9d622495bd2 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h
@@ -9,6 +9,8 @@
 
 namespace storage::spi::dummy { class DummyBucketExecutor; }
 struct JobTestBase : public ::testing::TestWithParam<bool> {
+    MonitoredRefCount _refCount;
+    test::ClusterStateHandler _clusterStateHandler;
     std::unique_ptr<storage::spi::dummy::DummyBucketExecutor> _bucketExecutor;
     std::unique_ptr<vespalib::SyncableThreadExecutor> _singleExecutor;
     std::unique_ptr<searchcorespi::index::IThreadService> _master;
@@ -16,8 +18,6 @@ struct JobTestBase : public ::testing::TestWithParam<bool> {
     MyStorer _storer;
     MyFrozenBucketHandler _frozenHandler;
     test::DiskMemUsageNotifier _diskMemUsageNotifier;
-    test::ClusterStateHandler _clusterStateHandler;
-    MonitoredRefCount _refCount;
     std::shared_ptr<BlockableMaintenanceJob> _job;
     JobTestBase();
     ~JobTestBase() override;