From 362421c2f93d8d628f8433177be0c303c25d81cc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 22 Aug 2019 10:25:19 -0500 Subject: [PATCH] osd/PeeringState: remove old query_map member Signed-off-by: Sage Weil --- src/osd/OSD.cc | 31 ------------------------------- src/osd/OSD.h | 2 -- src/osd/PeeringState.cc | 8 +------- src/osd/PeeringState.h | 17 ----------------- 4 files changed, 1 insertion(+), 57 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 1cbbdd619917d..1becc78a93a85 100644 --- 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 >& query_map, - OSDMapRef curmap) -{ - for (map >::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>& info_map, OSDMapRef curmap) { diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 4fa7f7db8611b..2a309cdd49e23 100644 --- 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 >& query_map, - OSDMapRef map); void do_infos(map>& info_map, OSDMapRef map); diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc index c30a8b1eb8583..94e9c3b8e8c37 100644 --- 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 >& query_map, map> *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 > 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 bcf748e05e2fe..c42e690fcb2f8 100644 --- a/src/osd/PeeringState.h +++ b/src/osd/PeeringState.h @@ -51,7 +51,6 @@ class PeeringCtx; // [primary only] content recovery state struct BufferedRecoveryMessages { - map > query_map; map> info_map; map> 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 > &query_map; map> &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 > &get_query_map() { - ceph_assert(state->rctx); - return state->rctx->query_map; - } - map> &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 >& query_map, map> *activator_map, PeeringCtxWrapper &ctx); -- 2.39.5