From 3b3511c38c1b58cdd906db5455cb9cb73be45971 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 5 Jan 2014 17:43:23 -0800 Subject: [PATCH] mon: debug propagate_snaps_to_tiers Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 3 ++- src/osd/OSDMap.cc | 5 ++++- src/osd/OSDMap.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 6c92b82f21677..9bab3f87ceb15 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -555,7 +555,8 @@ void OSDMonitor::encode_pending(MonitorDBStore::Transaction *t) // finalize up pending_inc pending_inc.modified = ceph_clock_now(g_ceph_context); - pending_inc.propagate_snaps_to_tiers(osdmap); + int r = pending_inc.propagate_snaps_to_tiers(g_ceph_context, osdmap); + assert(r == 0); bufferlist bl; diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index ffbbdff5e4243..b2be87dc43520 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -178,7 +178,8 @@ int OSDMap::Incremental::identify_osd(uuid_d u) const return -1; } -int OSDMap::Incremental::propagate_snaps_to_tiers(const OSDMap& osdmap) +int OSDMap::Incremental::propagate_snaps_to_tiers(CephContext *cct, + const OSDMap& osdmap) { assert(epoch == osdmap.get_epoch() + 1); for (map::iterator p = new_pools.begin(); @@ -207,6 +208,8 @@ int OSDMap::Incremental::propagate_snaps_to_tiers(const OSDMap& osdmap) if (tier->tier_of != p->first) return -EIO; + ldout(cct, 10) << __func__ << " from " << p->first << " to " + << r->first << dendl; tier->snap_seq = base.snap_seq; tier->snap_epoch = base.snap_epoch; tier->snaps = base.snaps; diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index dae46450dca0c..69b2cee622010 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -174,7 +174,7 @@ public: } /// propage update pools' snap metadata to any of their tiers - int propagate_snaps_to_tiers(const OSDMap &base); + int propagate_snaps_to_tiers(CephContext *cct, const OSDMap &base); }; private: -- 2.39.5