From: Sage Weil <sage@inktank.com>
Date: Mon, 6 Jan 2014 01:43:05 +0000 (-0800)
Subject: osd: fix propagation of removed snaps to other tiers
X-Git-Tag: v0.75~1^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f49d9cdeb7f7927fbb1ae9387261ff7ff54e6efe;p=ceph.git

osd: fix propagation of removed snaps to other tiers

When we update removed_snaps we do not update snap_seq.  Drop this broken
optimization.

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index b2be87dc4352..2a983b95526c 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -195,12 +195,6 @@ int OSDMap::Incremental::propagate_snaps_to_tiers(CephContext *cct,
 	  const pg_pool_t *orig = osdmap.get_pg_pool(*q);
 	  if (!orig)
 	    return -EIO;
-
-	  // skip update?
-	  if (orig->snap_seq == base.snap_seq &&
-	      orig->snap_epoch == base.snap_epoch)
-	    continue;
-
 	  tier = get_new_pool(*q, orig);
 	} else {
 	  tier = &r->second;