libceph: make RECOVERY_DELETES feature create a new interval

This is needed so that the OSDs can regenerate the missing set at the
start of a new interval where support for recovery deletes changed.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>

2 files changed, 9 insertions, 1 deletions

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index b5f016cb9569..dcfbdd74dfd1 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1337,6 +1337,8 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
         bool legacy_change;
         bool split = false;
         bool sort_bitwise = ceph_osdmap_flag(osdc, CEPH_OSDMAP_SORTBITWISE);
+        bool recovery_deletes = ceph_osdmap_flag(osdc,
+                                                 CEPH_OSDMAP_RECOVERY_DELETES);
         enum calc_target_result ct_res;
         int ret;
 
@@ -1399,6 +1401,8 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
                                  pi->pg_num,
                                  t->sort_bitwise,
                                  sort_bitwise,
+                                 t->recovery_deletes,
+                                 recovery_deletes,
                                  &last_pgid))
                 force_resend = true;
 
@@ -1421,6 +1425,7 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
                 t->pg_num = pi->pg_num;
                 t->pg_num_mask = pi->pg_num_mask;
                 t->sort_bitwise = sort_bitwise;
+                t->recovery_deletes = recovery_deletes;
 
                 t->osd = acting.primary;
         }
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index 0bec71fa712e..f358d0bfa76b 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -2082,6 +2082,8 @@ bool ceph_is_new_interval(const struct ceph_osds *old_acting,
                           u32 new_pg_num,
                           bool old_sort_bitwise,
                           bool new_sort_bitwise,
+                          bool old_recovery_deletes,
+                          bool new_recovery_deletes,
                           const struct ceph_pg *pgid)
 {
         return !osds_equal(old_acting, new_acting) ||
@@ -2089,7 +2091,8 @@ bool ceph_is_new_interval(const struct ceph_osds *old_acting,
                old_size != new_size ||
                old_min_size != new_min_size ||
                ceph_pg_is_split(pgid, old_pg_num, new_pg_num) ||
-               old_sort_bitwise != new_sort_bitwise;
+               old_sort_bitwise != new_sort_bitwise ||
+               old_recovery_deletes != new_recovery_deletes;
 }
 
 static int calc_pg_rank(int osd, const struct ceph_osds *acting)