osd: MOSDScrub cleanup

MOSDScrub message is not in use since Nautilus.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/messages/MOSDScrub.h b/src/messages/MOSDScrub.h
deleted file mode 100644 (file)
index 4f850fa..0000000
--- a/src/messages/MOSDScrub.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2004-2006 Sage Weil <sage@newdream.net>
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software 
- * Foundation.  See file COPYING.
- * 
- */
-
-
-#ifndef CEPH_MOSDSCRUB_H
-#define CEPH_MOSDSCRUB_H
-
-#include "msg/Message.h"
-
-/*
- * instruct an OSD to scrub some or all pg(s)
- */
-
-class MOSDScrub final : public Message {
-public:
-  static constexpr int HEAD_VERSION = 2;
-  static constexpr int COMPAT_VERSION = 2;
-
-  uuid_d fsid;
-  std::vector<pg_t> scrub_pgs;
-  bool repair = false;
-  bool deep = false;
-
-  MOSDScrub() : Message{MSG_OSD_SCRUB, HEAD_VERSION, COMPAT_VERSION} {}
-  MOSDScrub(const uuid_d& f, bool r, bool d) :
-    Message{MSG_OSD_SCRUB, HEAD_VERSION, COMPAT_VERSION},
-    fsid(f), repair(r), deep(d) {}
-  MOSDScrub(const uuid_d& f, std::vector<pg_t>& pgs, bool r, bool d) :
-    Message{MSG_OSD_SCRUB, HEAD_VERSION, COMPAT_VERSION},
-    fsid(f), scrub_pgs(pgs), repair(r), deep(d) {}
-private:
-  ~MOSDScrub() final {}
-
-public:
-  std::string_view get_type_name() const override { return "scrub"; }
-  void print(std::ostream& out) const override {
-    out << "scrub(";
-    if (scrub_pgs.empty())
-      out << "osd";
-    else
-      out << scrub_pgs;
-    if (repair)
-      out << " repair";
-    if (deep)
-      out << " deep";
-    out << ")";
-  }
-
-  void encode_payload(uint64_t features) override {
-    using ceph::encode;
-    encode(fsid, payload);
-    encode(scrub_pgs, payload);
-    encode(repair, payload);
-    encode(deep, payload);
-  }
-  void decode_payload() override {
-    using ceph::decode;
-    auto p = payload.cbegin();
-    decode(fsid, p);
-    decode(scrub_pgs, p);
-    decode(repair, p);
-    decode(deep, p);
-  }
-private:
-  template<class T, typename... Args>
-  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
-};
-
-#endif

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 03a5867a3382198e5dc95f0dea718a7f03dee229..e743b2348e85c565c23ffa6434520b3891e010f1 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -36,7 +36,6 @@
 #include "messages/MMgrCommand.h"
 #include "messages/MMgrCommandReply.h"
 #include "messages/MPGStats.h"
-#include "messages/MOSDScrub.h"
 #include "messages/MOSDScrub2.h"
 #include "messages/MOSDForceRecovery.h"
 #include "common/errno.h"
@@ -1360,20 +1359,14 @@ bool DaemonServer::_handle_command(
       if (p == osd_cons.end()) {
        failed_osds.insert(osd);
       } else {
-       sent_osds.insert(osd);
-       for (auto& con : p->second) {
-         if (HAVE_FEATURE(con->get_features(), SERVER_MIMIC)) {
-           con->send_message(new MOSDScrub2(monc->get_fsid(),
-                                            epoch,
-                                            spgs,
-                                            pvec.back() == "repair",
-                                            pvec.back() == "deep-scrub"));
-         } else {
-           con->send_message(new MOSDScrub(monc->get_fsid(),
-                                           pvec.back() == "repair",
-                                           pvec.back() == "deep-scrub"));
-         }
-       }
+        sent_osds.insert(osd);
+        for (auto& con : p->second) {
+         con->send_message(new MOSDScrub2(monc->get_fsid(),
+                                           epoch,
+                                           spgs,
+                                           pvec.back() == "repair",
+                                           pvec.back() == "deep-scrub"));
+        }
       }
     }
     if (failed_osds.size() == osds.size()) {
@@ -1437,21 +1430,11 @@ bool DaemonServer::_handle_command(
         return true;
       }
       for (auto& con : p->second) {
-        if (HAVE_FEATURE(con->get_features(), SERVER_MIMIC)) {
-          con->send_message(new MOSDScrub2(monc->get_fsid(),
-                                           epoch,
-                                           it.second,
-                                           prefix == "osd pool repair",
-                                           prefix == "osd pool deep-scrub"));
-        } else {
-          // legacy
-          auto q = pgs_by_primary.find(primary);
-          ceph_assert(q != pgs_by_primary.end());
-          con->send_message(new MOSDScrub(monc->get_fsid(),
-                                          q->second,
-                                          prefix == "osd pool repair",
-                                          prefix == "osd pool deep-scrub"));
-        }
+        con->send_message(new MOSDScrub2(monc->get_fsid(),
+                                         epoch,
+                                         it.second,
+                                         prefix == "osd pool repair",
+                                         prefix == "osd pool deep-scrub"));
       }
     }
     cmdctx->reply(0, "");

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 26020e7f1ef4d4a793a0147cd6f9818472846f08..51df33d0a57382f5495cf8d4d1d4048617a6c60a 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -53,7 +53,6 @@
 #include "messages/MOSDPGReadyToMerge.h"
 #include "messages/MMonCommand.h"
 #include "messages/MRemoveSnaps.h"
-#include "messages/MOSDScrub.h"
 #include "messages/MRoute.h"
 #include "messages/MMonGetPurgedSnaps.h"
 #include "messages/MMonGetPurgedSnapsReply.h"

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 9f57ddce3917e575af1e445c063ce56bd367f6f0..c6f5a3cdbbb30933cf88e96a01d30e96085467e7 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -89,7 +89,6 @@
 #include "messages/MOSDPGTrim.h"
 #include "messages/MOSDPGLease.h"
 #include "messages/MOSDPGLeaseAck.h"
-#include "messages/MOSDScrub.h"
 #include "messages/MOSDScrub2.h"
 #include "messages/MOSDScrubReserve.h"
 #include "messages/MOSDRepScrub.h"
@@ -580,9 +579,6 @@ Message *decode_message(CephContext *cct,
     m = make_message<MOSDPGLeaseAck>();
     break;
 
-  case MSG_OSD_SCRUB:
-    m = make_message<MOSDScrub>();
-    break;
   case MSG_OSD_SCRUB2:
     m = make_message<MOSDScrub2>();
     break;

diff --git a/src/msg/MessageRef.h b/src/msg/MessageRef.h
index 05c1a8e6987a6709ddf126bdfe4a15be7cb8846e..fd66872e72799d4e1d3a7392cf650e7bebb72af4 100644 (file)
--- a/src/msg/MessageRef.h
+++ b/src/msg/MessageRef.h
@@ -165,7 +165,6 @@ class MOSDRepOpReply;
 class MOSDRepScrub;
 class MOSDRepScrubMap;
 class MOSDScrub2;
-class MOSDScrub;
 class MOSDScrubReserve;
 class MPGStatsAck;
 class MPGStats;

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b970f796b807b517ec31abdabcb83b994a1272d7..038fd1f0f5deb0a412ce9946fbcc90ffe70c5b7f 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -113,7 +113,6 @@
 
 #include "messages/MOSDAlive.h"
 
-#include "messages/MOSDScrub.h"
 #include "messages/MOSDScrub2.h"
 
 #include "messages/MCommand.h"
@@ -7348,59 +7347,12 @@ void OSD::_dispatch(Message *m)
     break;
 
     // osd
-  case MSG_OSD_SCRUB:
-    handle_scrub(static_cast<MOSDScrub*>(m));
-    break;
-
   case MSG_COMMAND:
     handle_command(static_cast<MCommand*>(m));
     return;
   }
 }
 
-// remove me post-nautilus
-void OSD::handle_scrub(MOSDScrub *m)
-{
-  dout(10) << "handle_scrub " << *m << dendl;
-  if (!require_mon_or_mgr_peer(m)) {
-    m->put();
-    return;
-  }
-  if (m->fsid != monc->get_fsid()) {
-    dout(0) << "handle_scrub fsid " << m->fsid << " != " << monc->get_fsid()
-           << dendl;
-    m->put();
-    return;
-  }
-
-  vector<spg_t> spgs;
-  _get_pgids(&spgs);
-
-  if (!m->scrub_pgs.empty()) {
-    vector<spg_t> v;
-    for (auto pgid : m->scrub_pgs) {
-      spg_t pcand;
-      if (get_osdmap()->get_primary_shard(pgid, &pcand) &&
-         std::find(spgs.begin(), spgs.end(), pcand) != spgs.end()) {
-       v.push_back(pcand);
-      }
-    }
-    spgs.swap(v);
-  }
-
-  for (auto pgid : spgs) {
-    enqueue_peering_evt(
-      pgid,
-      PGPeeringEventRef(
-       std::make_shared<PGPeeringEvent>(
-         get_osdmap_epoch(),
-         get_osdmap_epoch(),
-         PeeringState::RequestScrub(m->deep, m->repair))));
-  }
-
-  m->put();
-}
-
 void OSD::handle_fast_scrub(MOSDScrub2 *m)
 {
   dout(10) << __func__ <<  " " << *m << dendl;

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 6bbe7b451cef10107784aeb2ec9598fbf6cd027b..ab1809057ea7577e4d1c35fef84c4938badf8b95 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -2008,7 +2008,6 @@ private:
                        ObjectStore *store,
                        uuid_d& cluster_fsid, uuid_d& osd_fsid, int whoami, std::string& osdspec_affinity);
 
-  void handle_scrub(class MOSDScrub *m);
   void handle_fast_scrub(class MOSDScrub2 *m);
   void handle_osd_ping(class MOSDPing *m);
 

diff --git a/src/osd/scrubber/PrimaryLogScrub.h b/src/osd/scrubber/PrimaryLogScrub.h
index 5dfec2f7f5aa996b1a30357be079bb511ecc18ad..58e66223e03868c7fb8abde617d6b7dba97db0e3 100644 (file)
--- a/src/osd/scrubber/PrimaryLogScrub.h
+++ b/src/osd/scrubber/PrimaryLogScrub.h
@@ -12,7 +12,6 @@
 #include "messages/MOSDOp.h"
 #include "messages/MOSDRepScrub.h"
 #include "messages/MOSDRepScrubMap.h"
-#include "messages/MOSDScrub.h"
 #include "messages/MOSDScrubReserve.h"
 #include "osd/OSD.h"
 

diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index bcf74d0e439822f08b887e02de88b1ea53e0dc7a..d2d7318c6034ca121c732bf4a0df78535f99af9b 100644 (file)
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -13,7 +13,6 @@
 #include "messages/MOSDOp.h"
 #include "messages/MOSDRepScrub.h"
 #include "messages/MOSDRepScrubMap.h"
-#include "messages/MOSDScrub.h"
 #include "messages/MOSDScrubReserve.h"
 #include "osd/OSD.h"
 #include "osd/PG.h"

diff --git a/src/tools/ceph-dencoder/common_types.h b/src/tools/ceph-dencoder/common_types.h
index 22e3e9d35d2b15fe9b92fe9b09951538ee19d6ea..594f2ed3e4051cf70c2801c10ed41337de43c2eb 100644 (file)
--- a/src/tools/ceph-dencoder/common_types.h
+++ b/src/tools/ceph-dencoder/common_types.h
@@ -405,9 +405,6 @@ MESSAGE(MOSDPing)
 #include "messages/MOSDRepScrub.h"
 MESSAGE(MOSDRepScrub)
 
-#include "messages/MOSDScrub.h"
-MESSAGE(MOSDScrub)
-
 #include "messages/MOSDScrub2.h"
 MESSAGE(MOSDScrub2)