From 0becb44ef42e3c7f281639a356dae9be8c0d792b Mon Sep 17 00:00:00 2001
From: Samuel Just <sjust@redhat.com>
Date: Thu, 19 Sep 2019 17:25:00 -0700
Subject: [PATCH] osd/PeeringState: eliminate unused cct from PGPool

Signed-off-by: Samuel Just <sjust@redhat.com>
---
 src/crimson/osd/pg.cc   |  1 -
 src/osd/OSD.cc          |  2 +-
 src/osd/PeeringState.cc |  6 +++---
 src/osd/PeeringState.h  | 14 ++++++--------
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 917e4ca447e31..9ebaf121efcea 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -103,7 +103,6 @@ PG::PG(
       pg_shard,
       pgid,
       PGPool(
-	shard_services.get_cct(),
 	osdmap,
 	pgid.pool(),
 	pool,
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 133ebb984b257..41f72879b39f8 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4527,7 +4527,7 @@ PG* OSD::_make_pg(
     }
     decode(ec_profile, p);
   }
-  PGPool pool(cct, createmap, pgid.pool(), pi, name);
+  PGPool pool(createmap, pgid.pool(), pi, name);
   PG *pg;
   if (pi.type == pg_pool_t::TYPE_REPLICATED ||
       pi.type == pg_pool_t::TYPE_ERASURE)
diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 36216664e2575..324cff0f5f8fd 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -104,7 +104,7 @@ void BufferedRecoveryMessages::send_info(
   }
 }
 
-void PGPool::update(CephContext *cct, OSDMapRef map)
+void PGPool::update(OSDMapRef map)
 {
   const pg_pool_t *pi = map->get_pg_pool(id);
   if (!pi) {
@@ -431,7 +431,7 @@ void PeeringState::advance_map(
 	    << dendl;
 
   update_osdmap_ref(osdmap);
-  pool.update(cct, osdmap);
+  pool.update(osdmap);
 
   AdvMap evt(
     osdmap, lastmap, newup, up_primary,
@@ -440,7 +440,7 @@ void PeeringState::advance_map(
   if (pool.info.last_change == osdmap_ref->get_epoch()) {
     pl->on_pool_change();
   }
-  readable_interval = pool.get_readable_interval();
+  readable_interval = pool.get_readable_interval(cct->_conf);
   last_require_osd_release = osdmap->require_osd_release;
 }
 
diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index e7ad22815678b..53b50b5c7a51d 100644
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -27,7 +27,6 @@
 #include "common/ostream_temp.h"
 
 struct PGPool {
-  CephContext* cct;
   epoch_t cached_epoch;
   int64_t id;
   std::string name;
@@ -35,25 +34,24 @@ struct PGPool {
   pg_pool_t info;
   SnapContext snapc;   // the default pool snapc, ready to go.
 
-  PGPool(CephContext* cct, OSDMapRef map, int64_t i, const pg_pool_t& info,
+  PGPool(OSDMapRef map, int64_t i, const pg_pool_t& info,
 	 const std::string& name)
-    : cct(cct),
-      cached_epoch(map->get_epoch()),
+    : cached_epoch(map->get_epoch()),
       id(i),
       name(name),
       info(info) {
     snapc = info.get_snap_context();
   }
 
-  void update(CephContext *cct, OSDMapRef map);
+  void update(OSDMapRef map);
 
-  ceph::timespan get_readable_interval() const {
+  ceph::timespan get_readable_interval(ConfigProxy &conf) const {
     double v = 0;
     if (info.opts.get(pool_opts_t::READ_LEASE_INTERVAL, &v)) {
       return ceph::make_timespan(v);
     } else {
-      auto hbi = cct->_conf->osd_heartbeat_grace;
-      auto fac = cct->_conf->osd_pool_default_read_lease_ratio;
+      auto hbi = conf->osd_heartbeat_grace;
+      auto fac = conf->osd_pool_default_read_lease_ratio;
       return ceph::make_timespan(hbi * fac);
     }
   }
-- 
2.39.5