osd/PeeringState: remove old query_map member

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1cbbdd619917d4d13a4aea72c574eb45e4431394..1becc78a93a856cf41f7660d019c3a85133cd288 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -9262,7 +9262,6 @@ void OSD::dispatch_context(PeeringCtx &ctx, PG *pg, OSDMapRef curmap,
   } else if (!is_active()) {
     dout(20) << __func__ << " not active" << dendl;
   } else {
-    do_queries(ctx.query_map, curmap);
     do_infos(ctx.info_map, curmap);
 
     for (auto& [osd, ls] : ctx.message_map) {
@@ -9293,36 +9292,6 @@ void OSD::dispatch_context(PeeringCtx &ctx, PG *pg, OSDMapRef curmap,
   }
 }
 
-/** do_queries
- * send out pending queries for info | summaries
- */
-void OSD::do_queries(map<int, map<spg_t,pg_query_t> >& query_map,
-                    OSDMapRef curmap)
-{
-  for (map<int, map<spg_t,pg_query_t> >::iterator pit = query_map.begin();
-       pit != query_map.end();
-       ++pit) {
-    if (!curmap->is_up(pit->first)) {
-      dout(20) << __func__ << " skipping down osd." << pit->first << dendl;
-      continue;
-    }
-    int who = pit->first;
-    ConnectionRef con = service.get_con_osd_cluster(who, curmap->get_epoch());
-    if (!con) {
-      dout(20) << __func__ << " skipping osd." << who
-              << " (NULL con)" << dendl;
-      continue;
-    }
-    service.maybe_share_map(con.get(), curmap);
-    dout(7) << __func__ << " querying osd." << who
-           << " on " << pit->second.size() << " PGs" << dendl;
-    MOSDPGQuery *m = new MOSDPGQuery(curmap->get_epoch(),
-                                    std::move(pit->second));
-    con->send_message(m);
-  }
-}
-
-
 void OSD::do_infos(map<int,vector<pg_notify_t>>& info_map,
                   OSDMapRef curmap)
 {

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 4fa7f7db8611ba9aa09bc08ade3ca08bea1d85b3..2a309cdd49e23bd43393a7449293b65d858de73f 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1916,8 +1916,6 @@ protected:
   void dispatch_context(PeeringCtx &ctx, PG *pg, OSDMapRef curmap,
                         ThreadPool::TPHandle *handle = NULL);
   void discard_context(PeeringCtx &ctx);
-  void do_queries(map<int, map<spg_t,pg_query_t> >& query_map,
-                 OSDMapRef map);
   void do_infos(map<int,vector<pg_notify_t>>& info_map,
                OSDMapRef map);
 

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index c30a8b1eb85831acc431d9fd68efdd0cfe451843..94e9c3b8e8c37914af925783e669c221045b95e9 100644 (file)
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -20,11 +20,9 @@
 #define dout_subsys ceph_subsys_osd
 
 BufferedRecoveryMessages::BufferedRecoveryMessages(PeeringCtx &ctx)
-  : query_map(std::move(ctx.query_map)),
-    info_map(std::move(ctx.info_map)),
+  : info_map(std::move(ctx.info_map)),
     message_map(std::move(ctx.message_map))
 {
-  ctx.query_map.clear();
   ctx.info_map.clear();
   ctx.message_map.clear();
 }
@@ -2083,7 +2081,6 @@ void PeeringState::build_might_have_unfound()
 void PeeringState::activate(
   ObjectStore::Transaction& t,
   epoch_t activation_epoch,
-  map<int, map<spg_t,pg_query_t> >& query_map,
   map<int,vector<pg_notify_t>> *activator_map,
   PeeringCtxWrapper &ctx)
 {
@@ -5267,7 +5264,6 @@ PeeringState::Active::Active(my_context ctx)
   ps->start_flush(context< PeeringMachine >().get_cur_transaction());
   ps->activate(context< PeeringMachine >().get_cur_transaction(),
               ps->get_osdmap_epoch(),
-              context< PeeringMachine >().get_query_map(),
               &context< PeeringMachine >().get_info_map(),
               context< PeeringMachine >().get_recovery_ctx());
 
@@ -5634,11 +5630,9 @@ boost::statechart::result PeeringState::ReplicaActive::react(
   const Activate& actevt) {
   DECLARE_LOCALS;
   psdout(10) << "In ReplicaActive, about to call activate" << dendl;
-  map<int, map<spg_t, pg_query_t> > query_map;
   ps->activate(
     context< PeeringMachine >().get_cur_transaction(),
     actevt.activation_epoch,
-    query_map,
     NULL,
     context< PeeringMachine >().get_recovery_ctx());
   psdout(10) << "Activate Finished" << dendl;

diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index bcf748e05e2febb482d2dfdeb7869fc220641b3b..c42e690fcb2f80900909488edd82d5051b632fb1 100644 (file)
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -51,7 +51,6 @@ class PeeringCtx;
 
 // [primary only] content recovery state
 struct BufferedRecoveryMessages {
-  map<int, map<spg_t, pg_query_t> > query_map;
   map<int, vector<pg_notify_t>> info_map;
   map<int, vector<MessageRef>> message_map;
 
@@ -59,12 +58,6 @@ struct BufferedRecoveryMessages {
   BufferedRecoveryMessages(PeeringCtx &);
 
   void accept_buffered_messages(BufferedRecoveryMessages &m) {
-    for (auto &[target, qmap] : m.query_map) {
-      auto &omap = query_map[target];
-      for (auto &[pg, query] : qmap) {
-       omap[pg] = query;
-      }
-    }
     for (auto &[target, ivec] : m.info_map) {
       auto &ovec = info_map[target];
       ovec.reserve(ovec.size() + ivec.size());
@@ -204,21 +197,18 @@ struct PeeringCtx : BufferedRecoveryMessages {
 struct PeeringCtxWrapper {
   utime_t start_time;
   BufferedRecoveryMessages &msgs;
-  map<int, map<spg_t, pg_query_t> > &query_map;
   map<int, vector<pg_notify_t>> &info_map;
   ObjectStore::Transaction &transaction;
   HBHandle * const handle = nullptr;
 
   PeeringCtxWrapper(PeeringCtx &wrapped) :
     msgs(wrapped),
-    query_map(wrapped.query_map),
     info_map(wrapped.info_map),
     transaction(wrapped.transaction),
     handle(wrapped.handle) {}
 
   PeeringCtxWrapper(BufferedRecoveryMessages &buf, PeeringCtx &wrapped)
     : msgs(buf),
-      query_map(buf.query_map),
       info_map(buf.info_map),
       transaction(wrapped.transaction),
       handle(wrapped.handle) {}
@@ -575,12 +565,6 @@ public:
       return state->rctx->transaction;
     }
 
-
-    map<int, map<spg_t, pg_query_t> > &get_query_map() {
-      ceph_assert(state->rctx);
-      return state->rctx->query_map;
-    }
-
     map<int, vector<pg_notify_t>> &get_info_map() {
       ceph_assert(state->rctx);
       return state->rctx->info_map;
@@ -1527,7 +1511,6 @@ public:
   void activate(
     ObjectStore::Transaction& t,
     epoch_t activation_epoch,
-    map<int, map<spg_t,pg_query_t> >& query_map,
     map<int, vector<pg_notify_t>> *activator_map,
     PeeringCtxWrapper &ctx);