From: Kefu Chai Date: Wed, 29 Jun 2022 14:08:11 +0000 (+0800) Subject: osd, crimson: add more constness X-Git-Tag: v18.0.0~534^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a254a6d701819ecae8eaddbdee8a6ccb43b27cec;p=ceph-ci.git osd, crimson: add more constness just for better readability and maintainability. Signed-off-by: Kefu Chai --- diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index fb1bbcc401e..e3d70901580 100644 --- 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 index 5e764e738fa..f1c474b0675 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -433,7 +433,7 @@ public: 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 index 4eed40b45ce..a5f9593df65 100644 --- 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 index 8aa5b8cfbd7..c22ea3fe37c 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -130,7 +130,7 @@ public: } } - ceph::signedspan get_mnow(); + ceph::signedspan get_mnow() const; private: // -- superblock -- diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 1f565b5067b..9723a4aa63f 100644 --- 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 index 889fe96c76b..0b0cdfc5c55 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -662,7 +662,7 @@ public: 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 index cdf762b7816..e127c38aa03 100644 --- a/src/osd/PeeringState.h +++ b/src/osd/PeeringState.h @@ -305,7 +305,7 @@ public: /// 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;