From 83a3513e95efc9d0dd9788a5effbc99ffc991adb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 15 Sep 2017 18:41:35 -0400 Subject: [PATCH] osd/PG: make osr public Signed-off-by: Sage Weil --- src/osd/PG.cc | 2 +- src/osd/PG.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index b1c60fa58e28..f04e5c39fdc2 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -279,6 +279,7 @@ PG::PG(OSDService *o, OSDMapRef curmap, const PGPool &_pool, spg_t p) : pg_id(p), coll(p), + osr(o->osr_registry.lookup_or_create(p, (stringify(p)))), osd(o), cct(o->cct), osdmap_ref(curmap), @@ -316,7 +317,6 @@ PG::PG(OSDService *o, OSDMapRef curmap, flushes_in_progress(0), pg_stats_publish_lock("PG::pg_stats_publish_lock"), pg_stats_publish_valid(false), - osr(osd->osr_registry.lookup_or_create(p, (stringify(p)))), finish_sync_event(NULL), backoff_lock("PG::backoff_lock"), scrub_after_recovery(false), diff --git a/src/osd/PG.h b/src/osd/PG.h index 9d9ba79013ad..106ce6606a82 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -251,6 +251,9 @@ public: const spg_t pg_id; const coll_t coll; + // for ordering writes + ceph::shared_ptr osr; + ObjectStore::CollectionHandle ch; // -- classes -- @@ -1106,9 +1109,6 @@ protected: bool pg_stats_publish_valid; pg_stat_t pg_stats_publish; - // for ordering writes - ceph::shared_ptr osr; - void _update_calc_stats(); void _update_blocked_by(); void publish_stats_to_osd(); -- 2.47.3