From: Sage Weil <sage@inktank.com>
Date: Thu, 19 Dec 2013 23:01:26 +0000 (-0800)
Subject: mon/OSDMonitor: propagate snap updates to tier pools on update
X-Git-Tag: v0.75~45^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=173b060b2dd5368b067600734aa66a849b9710c8;p=ceph.git

mon/OSDMonitor: propagate snap updates to tier pools on update

For any pg_pool_t update, verify that any changes to the pool snapshot
metadata are propagated to the tiers.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 7d2ca25b9db..2407b576350 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -554,6 +554,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);
+
   bufferlist bl;
 
   // tell me about it
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index a09ccf072ed..c4c1b44da66 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -190,8 +190,8 @@ int OSDMap::Incremental::propagate_snaps_to_tiers(const OSDMap& osdmap)
 	    return -EIO;
 
 	  // skip update?
-	  if (tier->snap_seq == base.snap_seq &&
-	      tier->snap_epoch == base.snap_epoch)
+	  if (orig->snap_seq == base.snap_seq &&
+	      orig->snap_epoch == base.snap_epoch)
 	    continue;
 
 	  tier = get_new_pool(*q, orig);