From: Kefu Chai <kchai@redhat.com>
Date: Fri, 13 Sep 2019 05:14:02 +0000 (+0800)
Subject: crimson/osd: pass octopus to PeeringCtx's constructor
X-Git-Tag: v15.1.0~1561^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5a851c679ef006f35b4f54a0b0704943a9029110;p=ceph-ci.git

crimson/osd: pass octopus to PeeringCtx's constructor

to accommodate the change of 77ecc327

classic OSD started to use single-pg peering ops since ce05c172, and it
switched over to these ops since octopus. and it's assumed that
crimson-osd won't be GA until octopus+2 release, so it's not needed to
support pre-octopus releases. hence "octopus" is passed to PeeringCtx's
constructor.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 6b2468d440c..b0586d2f02d 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -691,7 +691,7 @@ seastar::future<Ref<PG>> OSD::handle_pg_create_info(
 	  if (!pg)
 	    return seastar::make_ready_future<Ref<PG>>(Ref<PG>());
         return store->create_new_collection(coll_t(info->pgid)).then([this, &info, startmap, pg] (auto coll) {
-	  PeeringCtx rctx;
+	  PeeringCtx rctx{ceph_release_t::octopus};
 	  const pg_pool_t* pp = startmap->get_pg_pool(info->pgid.pool());
 
 	  int up_primary, acting_primary;
@@ -1005,7 +1005,8 @@ seastar::future<> OSD::consume_map(epoch_t epoch)
   auto &pgs = pg_map.get_pgs();
   return seastar::parallel_for_each(pgs.begin(), pgs.end(), [=](auto& pg) {
     return shard_services.start_operation<PGAdvanceMap>(
-      *this, pg.second, pg.second->get_osdmap_epoch(), epoch).second;
+      *this, pg.second, pg.second->get_osdmap_epoch(), epoch,
+      PeeringCtx{ceph_release_t::octopus}, false).second;
   }).then([epoch, this] {
     osdmap_gate.got_map(epoch);
     return seastar::make_ready_future();
diff --git a/src/crimson/osd/osd_operations/peering_event.h b/src/crimson/osd/osd_operations/peering_event.h
index 62ecccfbe72..7f32953a9e9 100644
--- a/src/crimson/osd/osd_operations/peering_event.h
+++ b/src/crimson/osd/osd_operations/peering_event.h
@@ -64,6 +64,7 @@ public:
     ShardServices &shard_services, const pg_shard_t &from, const spg_t &pgid,
     Args&&... args) :
     shard_services(shard_services),
+    ctx{ceph_release_t::octopus},
     from(from),
     pgid(pgid),
     evt(std::forward<Args>(args)...)