]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSDMap: propagate POOL_SNAPS|SELFMANAGED_SNAPS to tiers 21282/head
authorSage Weil <sage@redhat.com>
Sun, 8 Apr 2018 19:40:45 +0000 (14:40 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Apr 2018 11:51:39 +0000 (06:51 -0500)
We set this when we add selfmanaged snaps to the base tier.  When those
propagate to the cache tier, propagate the flags, too!

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

index 8ba0bb40e58050f58933cb62e5ffcfa5aaa2ed4c..df4cc611e87e6acf3a3acfbaf6ad2626343d5ba2 100644 (file)
@@ -234,6 +234,8 @@ int OSDMap::Incremental::propagate_snaps_to_tiers(CephContext *cct,
        tier->snap_epoch = base.snap_epoch;
        tier->snaps = base.snaps;
        tier->removed_snaps = base.removed_snaps;
+       tier->flags |= base.flags & (pg_pool_t::FLAG_SELFMANAGED_SNAPS|
+                                    pg_pool_t::FLAG_POOL_SNAPS);
 
        if (new_rem_it != new_removed_snaps.end()) {
          new_removed_snaps[tier_pool] = new_rem_it->second;