Merge pull request #15879 from vespa-engine/balder/gc-remap-queue-after-disk-move

GC unused remapQueueAfterDiskMove method.

3 files changed, 7 insertions, 21 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h b/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h
index 7723d0ee765..f6353f69c65 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h
@@ -151,18 +151,6 @@ public:
     virtual BucketLockInterface::SP lock(const document::Bucket&, api::LockingRequirements lockReq) = 0;
 
     /**
-     * Called by FileStorThread::onBucketDiskMove() after moving file, in case
-     * we need to move operations from one disk queue to another.
-     *
-     * get/put/remove/update/revert/stat/multiop - Move to correct queue
-     * merge messages - Move to correct queue. Move any filestor thread state.
-     * join/split/getiter/repair/deletebucket - Move to correct queue
-     * requeststatus - Ignore
-     * readbucketinfo/bucketdiskmove/internalbucketjoin - Fail and log errors
-     */
-    virtual void remapQueueAfterDiskMove(const document::Bucket &bucket) = 0;
-
-    /**
      * Called by FileStorThread::onJoin() after joining a bucket into another,
      * in case we need to move operations from one disk queue to another, and
      * to remap operations to contain correct bucket target.
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index ec8521d3ab1..7a53e1bbeaf 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -383,7 +383,10 @@ struct MultiLockGuard {
     std::map<uint16_t, std::mutex*> monitors;
     std::vector<std::shared_ptr<monitor_guard>> guards;
 
-    MultiLockGuard() = default;
+    MultiLockGuard();
+    MultiLockGuard(const MultiLockGuard &) = delete;
+    MultiLockGuard & operator=(const MultiLockGuard &) = delete;
+    ~MultiLockGuard();
 
     void addLock(std::mutex & lock, uint16_t stripe_index) {
         monitors[stripe_index] = & lock;
@@ -395,6 +398,9 @@ struct MultiLockGuard {
     }
 };
 
+MultiLockGuard::MultiLockGuard() = default;
+MultiLockGuard::~MultiLockGuard() = default;
+
 document::DocumentId
 getDocId(const api::StorageMessage& msg) {
     switch (msg.getType().getId()) {
@@ -699,13 +705,6 @@ FileStorHandlerImpl::remapQueueNoLock(const RemapInfo& source, std::vector<Remap
 }
 
 void
-FileStorHandlerImpl::remapQueueAfterDiskMove(const document::Bucket& bucket)
-{
-    RemapInfo target(bucket);
-    remapQueue(RemapInfo(bucket), target, FileStorHandlerImpl::MOVE);
-}
-
-void
 FileStorHandlerImpl::remapQueueAfterJoin(const RemapInfo& source, RemapInfo& target)
 {
     remapQueue(source, target, FileStorHandlerImpl::JOIN);
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h
index 688a4b96def..819013e5c13 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h
@@ -191,7 +191,6 @@ public:
 
     FileStorHandler::LockedMessage getNextMessage(uint32_t stripeId) override;
 
-    void remapQueueAfterDiskMove(const document::Bucket& bucket) override;
     void remapQueueAfterJoin(const RemapInfo& source, RemapInfo& target) override;
     void remapQueueAfterSplit(const RemapInfo& source, RemapInfo& target1, RemapInfo& target2) override;