- Can not move away shared_ptr.

- Remove the recompute token once complete.

1 files changed, 2 insertions, 1 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/bucketmovejobv2.cpp b/searchcore/src/vespa/searchcore/proton/server/bucketmovejobv2.cpp
index 9d036519a6f..89e8c2d7c79 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bucketmovejobv2.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/bucketmovejobv2.cpp
@@ -257,6 +257,7 @@ BucketMoveJobV2::handleMoveResult(BucketMoverSP mover) {
             reconsiderBucket(_ready.meta_store()->getBucketDB().takeGuard(), bucket);
         }
         if (_bucketsInFlight.empty() && _postponedUntilSafe.contains(RECOMPUTE_BUCKETID)) {
+            _postponedUntilSafe.erase(RECOMPUTE_BUCKETID);
             recompute();
         }
     }
@@ -270,7 +271,7 @@ BucketMoveJobV2::cancelBucket(BucketId bucket) {
         _movers.erase(std::remove_if(_movers.begin(), _movers.end(),
                                      [bucket](const BucketMoverSP &mover) { return mover->getBucket() == bucket; }),
                       _movers.end());
-        handleMoveResult(std::move(inFlight->second));
+        handleMoveResult(inFlight->second);
     }
 }