osd: add get_mnow() interface to OSDService, PG, PeeringState

Single helper to provide a monotonic time offset from startup_time.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f3c975c48d9ab3bda8cb16b0dd10b4706d5df7db..83d2e50643b902ad922e6eb74258800aa45f1228 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -321,6 +321,10 @@ void OSDService::dump_live_pgids()
 #endif
 
 
+ceph::signedspan OSDService::get_mnow()
+{
+  return ceph::mono_clock::now() - osd->startup_time;
+}
 
 void OSDService::identify_splits_and_merges(
   OSDMapRef old_map,

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 5ac1348e77bf5671b16403d3749a7fd5c5a9fae2..6b144885e55539ff99ca019061abbc95fe7b2252 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -138,6 +138,8 @@ public:
     }
   }
 
+  ceph::signedspan get_mnow();
+
 private:
   // -- superblock --
   ceph::mutex publish_lock, pre_publish_lock; // pre-publish orders before publish

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 238698da13c39f4c8fa34fda106d7418a7fca11f..a829a778c85e0b794d8ebe509d1f84f9499e5cee 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1800,6 +1800,11 @@ void PG::send_pg_created(pg_t pgid)
   osd->send_pg_created(pgid);
 }
 
+ceph::signedspan PG::get_mnow()
+{
+  return osd->get_mnow();
+}
+
 void PG::rebuild_missing_set_with_deletes(PGLog &pglog)
 {
   pglog.rebuild_missing_set_with_deletes(

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 7482add43971c05cecdf1cf3aaf100652bccca3a..6c5963f763829018fb4b7f7b1fbeb991f2f37fae 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -478,6 +478,8 @@ public:
 
   void send_pg_created(pg_t pgid) override;
 
+  ceph::signedspan get_mnow() override;
+
   void rebuild_missing_set_with_deletes(PGLog &pglog) override;
 
   void queue_peering_event(PGPeeringEventRef evt);

diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index 46abe1af0354763586adc01e74114f0a4ccf88b1..3093697572227c3f4cd7c4d7aacbe9b4288c796b 100644 (file)
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -124,6 +124,8 @@ public:
     /// Send pg_created to mon
     virtual void send_pg_created(pg_t pgid) = 0;
 
+    virtual ceph::signedspan get_mnow() = 0;
+
     // ============ Flush state ==================
     /**
      * try_flush_or_schedule_async()