Make handle stop in a uniform way by putting the basics in the base class.

3 files changed, 13 insertions, 30 deletions

diff --git a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp
index 4287a6b262a..8862a6d3bb2 100644
--- a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp
@@ -34,13 +34,11 @@ struct MyMaintenanceJob : public IBlockableMaintenanceJob
     GateVector _runGates;
     size_t     _runIdx;
     bool       _blocked;
-    bool       _stopped;
     MyMaintenanceJob(size_t numRuns)
         : IBlockableMaintenanceJob("myjob", 10s, 20s),
           _runGates(getGateVector(numRuns)),
           _runIdx(0),
-          _blocked(false),
-          _stopped(false)
+          _blocked(false)
     {}
     void block() { setBlocked(BlockedReason::RESOURCE_LIMITS); }
     void unBlock() { unBlock(BlockedReason::RESOURCE_LIMITS); }
@@ -51,7 +49,7 @@ struct MyMaintenanceJob : public IBlockableMaintenanceJob
         _runGates[_runIdx++]->await(5s);
         return _runIdx == _runGates.size();
     }
-    void onStop() override { _stopped = true; }
+    void onStop() override { }
 };
 
 struct Fixture
@@ -65,10 +63,10 @@ struct Fixture
     size_t _runIdx;
     ThreadStackExecutor _exec;
     Fixture(size_t numRuns = 1)
-        : _tracker(new SimpleJobTracker(1)),
-          _job(new MyMaintenanceJob(numRuns)),
+        : _tracker(std::make_shared<SimpleJobTracker>(1)),
+          _job(std::make_unique<MyMaintenanceJob>(numRuns)),
           _myJob(static_cast<MyMaintenanceJob *>(_job.get())),
-          _trackedJob(new JobTrackedMaintenanceJob(_tracker, std::move(_job))),
+          _trackedJob(std::make_unique<JobTrackedMaintenanceJob>(_tracker, std::move(_job))),
           _runRetval(false),
           _runGates(getGateVector(numRuns)),
           _runIdx(0),
@@ -144,9 +142,9 @@ TEST_F("require that block calls are sent to underlying jobs", Fixture)
 
 TEST_F("require that stop calls are sent to underlying jobs", Fixture)
 {
-    EXPECT_FALSE(f._myJob->_stopped);
-    f._trackedJob->onStop();
-    EXPECT_TRUE(f._myJob->_stopped);
+    EXPECT_FALSE(f._myJob->stopped());
+    f._trackedJob->stop();
+    EXPECT_TRUE(f._myJob->stopped());
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
index 49236a829f5..e73fa739fbb 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
@@ -290,17 +290,14 @@ struct MySimpleJob : public BlockableMaintenanceJob
 {
     vespalib::CountDownLatch _latch;
     size_t                   _runCnt;
-    bool                     _stopped;
 
     MySimpleJob(vespalib::duration delay,
                 vespalib::duration interval,
                 uint32_t finishCount)
         : BlockableMaintenanceJob("my_job", delay, interval),
           _latch(finishCount),
-          _runCnt(0),
-          _stopped(false)
-    {
-    }
+          _runCnt(0)
+    { }
     void block() { setBlocked(BlockedReason::FROZEN_BUCKET); }
     bool run() override {
         LOG(info, "MySimpleJob::run()");
@@ -308,10 +305,6 @@ struct MySimpleJob : public BlockableMaintenanceJob
         ++_runCnt;
         return true;
     }
-    void onStop() override {
-        BlockableMaintenanceJob::onStop();
-        _stopped = true;
-    }
 };
 
 struct MySplitJob : public MySimpleJob
@@ -333,13 +326,11 @@ struct MySplitJob : public MySimpleJob
 struct MyLongRunningJob : public BlockableMaintenanceJob
 {
     vespalib::Gate _firstRun;
-    bool           _stopped;
 
     MyLongRunningJob(vespalib::duration delay,
                      vespalib::duration interval)
         : BlockableMaintenanceJob("long_running_job", delay, interval),
-          _firstRun(),
-          _stopped(false)
+          _firstRun()
     {
     }
     void block() { setBlocked(BlockedReason::FROZEN_BUCKET); }
@@ -348,10 +339,6 @@ struct MyLongRunningJob : public BlockableMaintenanceJob
         usleep(10000);
         return false;
     }
-    void onStop() override {
-        BlockableMaintenanceJob::onStop();
-        _stopped = true;
-    }
 };
 
 using MyAttributeManager = test::MockAttributeManager;
diff --git a/searchcore/src/tests/proton/documentdb/move_operation_limiter/move_operation_limiter_test.cpp b/searchcore/src/tests/proton/documentdb/move_operation_limiter/move_operation_limiter_test.cpp
index 1f152f4a257..8466a016fc3 100644
--- a/searchcore/src/tests/proton/documentdb/move_operation_limiter/move_operation_limiter_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/move_operation_limiter/move_operation_limiter_test.cpp
@@ -12,11 +12,9 @@ using namespace proton;
 
 struct MyBlockableMaintenanceJob : public IBlockableMaintenanceJob {
     bool blocked;
-    bool stopped;
     MyBlockableMaintenanceJob()
         : IBlockableMaintenanceJob("my_job", 1s, 1s),
-          blocked(false),
-          stopped(false)
+          blocked(false)
     {}
     void setBlocked(BlockedReason reason) override {
         ASSERT_TRUE(reason == BlockedReason::OUTSTANDING_OPS);
@@ -29,7 +27,7 @@ struct MyBlockableMaintenanceJob : public IBlockableMaintenanceJob {
         blocked = false;
     }
     bool run() override { return true; }
-    void onStop() override { stopped = true; }
+    void onStop() override { }
 };
 
 struct Fixture {