From: Sage Weil <sage@redhat.com>
Date: Sun, 8 Apr 2018 19:40:45 +0000 (-0500)
Subject: osd/OSDMap: propagate POOL_SNAPS|SELFMANAGED_SNAPS to tiers
X-Git-Tag: v13.1.0~363^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21282%2Fhead;p=ceph.git

osd/OSDMap: propagate POOL_SNAPS|SELFMANAGED_SNAPS to tiers

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>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 8ba0bb40e580..df4cc611e87e 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -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;