mon: debug propagate_snaps_to_tiers

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 6c92b82f216775560cadaf607c8a6bed6722a039..9bab3f87ceb15bc41600d2edb3c07d895c2ef95a 100644 (file)
--- 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 ffbbdff5e42435b1b44f9518cd8a0d139227be80..b2be87dc43520e2c116f328dd280bae76fd92b36 100644 (file)
--- 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<int64_t,pg_pool_t>::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 dae46450dca0c603f0b4a4828318ed0d21b93d08..69b2cee622010f03ed622abbf8d87410e2383373 100644 (file)
--- 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: