From: Matan Breizman <mbreizma@redhat.com>
Date: Sun, 15 Oct 2023 14:28:19 +0000 (+0000)
Subject: osd/osd_types: don't increment snap_seq on removal
X-Git-Tag: v19.3.0~302^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d808bbab2f6057ddbf53de2b385db8c14ae7d2c;p=ceph.git

osd/osd_types: don't increment snap_seq on removal

Avoid adjacent snap ids removals discontinuity in monitor's purged_snap and OSD's PSN entries.

Fixes: https://tracker.ceph.com/issues/62983

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 664d8a287406..8d4ba74789fc 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -1755,19 +1755,13 @@ void pg_pool_t::remove_snap(snapid_t s)
 {
   ceph_assert(snaps.count(s));
   snaps.erase(s);
-  snap_seq = snap_seq + 1;
 }
 
 void pg_pool_t::remove_unmanaged_snap(snapid_t s, bool preoctopus_compat)
 {
   ceph_assert(is_unmanaged_snaps_mode());
-  ++snap_seq;
   if (preoctopus_compat) {
     removed_snaps.insert(s);
-    // try to add in the new seq, just to try to keep the interval_set contiguous
-    if (!removed_snaps.contains(get_snap_seq())) {
-      removed_snaps.insert(get_snap_seq());
-    }
   }
 }