diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-02 08:39:21 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-02 08:39:21 +0000 |
commit | c8e1a1e81fb4eccdaa8d5c917356082dc25d279f (patch) | |
tree | 94d97f7f5068d546cfe663d3065c86d3785e2086 /searchcore | |
parent | 61cbfbe0dd4b35461c2662812588573e40e7a3cd (diff) |
- Can not move away shared_ptr.
- Remove the recompute token once complete.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/bucketmovejobv2.cpp | 3 |
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); } } |