]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: fix propagation of removed snaps to other tiers
authorSage Weil <sage@inktank.com>
Mon, 6 Jan 2014 01:43:05 +0000 (17:43 -0800)
committerSage Weil <sage@inktank.com>
Tue, 14 Jan 2014 00:19:48 +0000 (16:19 -0800)
When we update removed_snaps we do not update snap_seq.  Drop this broken
optimization.

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/OSDMap.cc

index aa20993f56a5f4c2803289d705cc8329ea8ec52e..beeefe672165780b1d322515d3ce7def4ef39f82 100644 (file)
@@ -194,12 +194,6 @@ int OSDMap::Incremental::propagate_snaps_to_tiers(const OSDMap& osdmap)
          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;