Only count the operation once.

Update test after code is fixed.

3 files changed, 7 insertions, 10 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 e7dc9b9e873..9db18091268 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp
@@ -569,7 +569,7 @@ TEST_F(MaxOutstandingMoveOpsFixture_2, require_that_bucket_move_job_is_blocked_i
     sync();
     assertDocsMoved(2, 2);
 
-    unblockJob(2);
+    unblockJob(1);
     assertRunToFinished();
     sync();
     assertDocsMoved(3, 1);
diff --git a/searchcore/src/vespa/searchcore/proton/server/bucketmovejobv2.cpp b/searchcore/src/vespa/searchcore/proton/server/bucketmovejobv2.cpp
index 1bbfe91c223..77eaa9e3aec 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bucketmovejobv2.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/bucketmovejobv2.cpp
@@ -156,7 +156,6 @@ BucketMoveJobV2::startMove(BucketMoverSP mover, size_t maxDocsToMove) {
     if (keys.empty()) return;
     if (_stopped.load(std::memory_order_relaxed)) return;
     mover->updateLastValidGid(keys.back()._gid);
-    auto context = getLimiter().beginOperation();
     Bucket spiBucket(document::Bucket(_bucketSpace, mover->getBucket()));
     auto bucketTask = makeBucketTask(
             [this, mover=std::move(mover), keys=std::move(keys),opsTracker=getLimiter().beginOperation()]
diff --git a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h
index 37b4426ee18..b398cb5bb4c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h
+++ b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h
@@ -17,17 +17,15 @@ private:
     bool                _running;
 
 public:
-    JobTrackedMaintenanceJob(const IJobTracker::SP &tracker,
-                             IMaintenanceJob::UP job);
-    ~JobTrackedMaintenanceJob();
+    JobTrackedMaintenanceJob(const IJobTracker::SP &tracker, IMaintenanceJob::UP job);
+    ~JobTrackedMaintenanceJob() override;
 
-    // Implements IMaintenanceJob
-    virtual bool isBlocked() const override { return _job->isBlocked(); }
-    virtual IBlockableMaintenanceJob *asBlockable() override { return _job->asBlockable(); }
-    virtual void registerRunner(IMaintenanceJobRunner *runner) override {
+    bool isBlocked() const override { return _job->isBlocked(); }
+    IBlockableMaintenanceJob *asBlockable() override { return _job->asBlockable(); }
+    void registerRunner(IMaintenanceJobRunner *runner) override {
         _job->registerRunner(runner);
     }
-    virtual bool run() override;
+    bool run() override;
 };
 
 } // namespace proton