Remove RepairBucketCommand

5 files changed, 0 insertions, 150 deletions

diff --git a/storage/src/vespa/storage/common/bucketmessages.cpp b/storage/src/vespa/storage/common/bucketmessages.cpp
index 1a4dc61a3ce..f953428fc8a 100644
--- a/storage/src/vespa/storage/common/bucketmessages.cpp
+++ b/storage/src/vespa/storage/common/bucketmessages.cpp
@@ -106,70 +106,6 @@ std::unique_ptr<api::StorageReply> ReadBucketInfo::makeReply() {
     return std::make_unique<ReadBucketInfoReply>(*this);
 }
 
-
-RepairBucketCommand::RepairBucketCommand(const document::Bucket &bucket, uint16_t disk)
-    : api::InternalCommand(ID),
-      _bucket(bucket),
-      _disk(disk),
-      _verifyBody(false),
-      _moveToIdealDisk(false)
-{
-    setPriority(LOW);
-}
-
-RepairBucketCommand::~RepairBucketCommand() = default;
-
-void
-RepairBucketCommand::print(std::ostream& out, bool verbose, const std::string& indent) const {
-    out << getSummary();
-    if (verbose) {
-        out << " : ";
-        InternalCommand::print(out, true, indent);
-    }
-}
-    
-void
-RepairBucketCommand::setBucketId(const document::BucketId& id)
-{
-    document::Bucket newBucket(_bucket.getBucketSpace(), id);
-    _bucket = newBucket;
-}
-
-vespalib::string
-RepairBucketCommand::getSummary() const {
-    vespalib::asciistream s;
-    s << "ReadBucketInfo(" << _bucket.toString() << ", disk " << _disk
-      << (_verifyBody ? ", verifying body" : "")
-      << (_moveToIdealDisk ? ", moving to ideal disk" : "")
-      << ")";
-    return s.str();
-}
-
-RepairBucketReply::RepairBucketReply(const RepairBucketCommand& cmd, const api::BucketInfo& bucketInfo)
-    : api::InternalReply(ID, cmd),
-      _bucket(cmd.getBucket()),
-      _bucketInfo(bucketInfo),
-      _disk(cmd.getDisk()),
-      _altered(false)
-{ }
-
-RepairBucketReply::~RepairBucketReply() = default;
-
-void
-RepairBucketReply::print(std::ostream& out, bool verbose, const std::string& indent) const {
-    out << "RepairBucketReply()";
-
-    if (verbose) {
-        out << " : ";
-        InternalReply::print(out, true, indent);
-    }
-}
-
-std::unique_ptr<api::StorageReply>
-RepairBucketCommand::makeReply() {
-    return std::make_unique<RepairBucketReply>(*this);
-}
-
 BucketDiskMoveCommand::BucketDiskMoveCommand(const document::Bucket &bucket,
                                              uint16_t srcDisk, uint16_t dstDisk)
     : api::InternalCommand(ID),
diff --git a/storage/src/vespa/storage/common/bucketmessages.h b/storage/src/vespa/storage/common/bucketmessages.h
index 941928b1064..fed944fb217 100644
--- a/storage/src/vespa/storage/common/bucketmessages.h
+++ b/storage/src/vespa/storage/common/bucketmessages.h
@@ -114,76 +114,6 @@ public:
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 };
 
-
-/**
- * @class RepairBucketCommand
- * @ingroup common
- *
- * @brief Repair a given bucket (if it contain errors).
- *
- * This message is sent continually by the bucket integrity checker.
- * Errors found are reported back.
- */
-class RepairBucketCommand : public api::InternalCommand {
-    document::Bucket _bucket;
-    uint16_t _disk;
-    bool _verifyBody; // Optional as it is expensive
-    bool _moveToIdealDisk; // Optional as it is expensive
-
-public:
-    typedef std::unique_ptr<RepairBucketCommand> UP;
-
-    static const uint32_t ID = 2007;
-
-    RepairBucketCommand(const document::Bucket &bucket, uint16_t disk);
-    ~RepairBucketCommand();
-
-    bool hasSingleBucketId() const override { return true; }
-    document::Bucket getBucket() const override { return _bucket; }
-
-    uint16_t getDisk() const { return _disk; }
-    bool verifyBody() const { return _verifyBody; }
-    bool moveToIdealDisk() const { return _moveToIdealDisk; }
-
-    void setBucketId(const document::BucketId& id);
-    void verifyBody(bool doIt) { _verifyBody = doIt; }
-    void moveToIdealDisk(bool doIt) { _moveToIdealDisk = doIt; }
-
-    std::unique_ptr<api::StorageReply> makeReply() override;
-
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-private:
-    vespalib::string getSummary() const override;
-};
-
-/**
- * @class RepairBucketReply
- * @ingroup common
- */
-class RepairBucketReply : public api::InternalReply {
-    document::Bucket _bucket;
-    api::BucketInfo _bucketInfo;
-    uint16_t _disk;
-    bool _altered;
-
-public:
-    typedef std::unique_ptr<RepairBucketReply> UP;
-    static const uint32_t ID = 2008;
-
-    RepairBucketReply(const RepairBucketCommand& cmd, const api::BucketInfo& bucketInfo = api::BucketInfo());
-    ~RepairBucketReply();
-    document::Bucket getBucket() const override { return _bucket; }
-    bool hasSingleBucketId() const override { return true; }
-
-    const api::BucketInfo& getBucketInfo() const { return _bucketInfo; }
-    uint16_t getDisk() const { return _disk; }
-
-    bool bucketAltered() const { return _altered; }
-    void setAltered(bool altered) { _altered = altered; }
-
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-};
-
 /**
  * @class BucketDiskMoveCommand
  * @ingroup common
diff --git a/storage/src/vespa/storage/common/messagebucket.cpp b/storage/src/vespa/storage/common/messagebucket.cpp
index 4a6f638262d..73c0827c05b 100644
--- a/storage/src/vespa/storage/common/messagebucket.cpp
+++ b/storage/src/vespa/storage/common/messagebucket.cpp
@@ -64,8 +64,6 @@ getStorageMessageBucket(const api::StorageMessage& msg)
             return static_cast<const ReadBucketList&>(msg).getBucket();
         case ReadBucketInfo::ID:
             return static_cast<const ReadBucketInfo&>(msg).getBucket();
-        case RepairBucketCommand::ID:
-            return static_cast<const RepairBucketCommand&>(msg).getBucket();
         case BucketDiskMoveCommand::ID:
             return static_cast<const BucketDiskMoveCommand&>(msg).getBucket();
         case InternalBucketJoinCommand::ID:
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index 5ad37d585ef..e23d65f72ac 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -648,11 +648,6 @@ FileStorHandlerImpl::remapMessage(api::StorageMessage& msg, const document::Buck
             break;
         case GetIterCommand::ID:
             bucket = static_cast<GetIterCommand&>(msg).getBucket();
-            [[fallthrough]];
-        case RepairBucketCommand::ID:
-            if (bucket.getBucketId().getRawId() == 0) {
-                bucket = static_cast<RepairBucketCommand&>(msg).getBucket();
-            }
             // Move to correct queue if op == MOVE
             // Fail with bucket not found if op != MOVE
             if (bucket == source) {
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index 6eab44923f7..59ae6b83f56 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -692,15 +692,6 @@ FileStorManager::onInternal(const shared_ptr<api::InternalCommand>& msg)
         }
         return true;
     }
-    case RepairBucketCommand::ID:
-    {
-        shared_ptr<RepairBucketCommand> cmd(std::static_pointer_cast<RepairBucketCommand>(msg));
-        StorBucketDatabase::WrappedEntry entry(mapOperationToDisk(*cmd, cmd->getBucket()));
-        if (entry.exist()) {
-            handlePersistenceMessage(cmd, entry->disk);
-        }
-        return true;
-    }
     case BucketDiskMoveCommand::ID:
     {
         shared_ptr<BucketDiskMoveCommand> cmd(std::static_pointer_cast<BucketDiskMoveCommand>(msg));