Merge pull request #46895 from tchaikov/wip-more-constness

osd, crimson: add more constness Reviewed-by: Ronen Friedman <rfriedma@redhat.com> Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
ceph · Jul 10, 2022 · e8e2cca · e8e2cca
2 parents 33f576a + a254a6d
commit e8e2cca
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
@@ -380,7 +380,7 @@ void PG::log_state_exit(
     events);
 }
 
-ceph::signedspan PG::get_mnow()
+ceph::signedspan PG::get_mnow() const
 {
   return shard_services.get_mnow();
 }

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
@@ -433,7 +433,7 @@ class PG : public boost::intrusive_ref_counter<
     return OstreamTemp(CLOG_ERROR, nullptr);
   }
 
-  ceph::signedspan get_mnow() final;
+  ceph::signedspan get_mnow() const final;
   HeartbeatStampsRef get_hb_stamps(int peer) final;
   void schedule_renew_lease(epoch_t plr, ceph::timespan delay) final;
 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -342,7 +342,7 @@ void OSDService::dump_live_pgids()
 #endif
 
 
-ceph::signedspan OSDService::get_mnow()
+ceph::signedspan OSDService::get_mnow() const
 {
   return ceph::mono_clock::now() - osd->startup_time;
 }

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
@@ -130,7 +130,7 @@ class OSDService : public Scrub::ScrubSchedListener {
     }
   }
 
-  ceph::signedspan get_mnow();
+  ceph::signedspan get_mnow() const;
 
 private:
   // -- superblock --

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
@@ -1854,7 +1854,7 @@ void PG::send_pg_created(pg_t pgid)
   osd->send_pg_created(pgid);
 }
 
-ceph::signedspan PG::get_mnow()
+ceph::signedspan PG::get_mnow() const
 {
   return osd->get_mnow();
 }

diff --git a/src/osd/PG.h b/src/osd/PG.h
@@ -662,7 +662,7 @@ class PG : public DoutPrefixProvider,
 
   void send_pg_created(pg_t pgid) override;
 
-  ceph::signedspan get_mnow() override;
+  ceph::signedspan get_mnow() const override;
   HeartbeatStampsRef get_hb_stamps(int peer) override;
   void schedule_renew_lease(epoch_t lpr, ceph::timespan delay) override;
   void queue_check_readable(epoch_t lpr, ceph::timespan delay) override;

diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
@@ -305,7 +305,7 @@ class PeeringState : public MissingLoc::MappingInfo {
     /// Send pg_created to mon
     virtual void send_pg_created(pg_t pgid) = 0;
 
-    virtual ceph::signedspan get_mnow() = 0;
+    virtual ceph::signedspan get_mnow() const = 0;
     virtual HeartbeatStampsRef get_hb_stamps(int peer) = 0;
     virtual void schedule_renew_lease(epoch_t plr, ceph::timespan delay) = 0;
     virtual void queue_check_readable(epoch_t lpr, ceph::timespan delay) = 0;