crimson/osd/osd_operations/snaptrim_event: only increase

osd_osd_param_t::at_version after clone adjustments

Fixes: https://tracker.ceph.com/issues/67945
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

diff --git a/src/crimson/osd/osd_operations/snaptrim_event.cc b/src/crimson/osd/osd_operations/snaptrim_event.cc
index 7ae90937672fb00d2a86357b470bf74fdb4d4eb3..7512b3d108dfc7e17177e76cd873aef824e516fc 100644 (file)
--- a/src/crimson/osd/osd_operations/snaptrim_event.cc
+++ b/src/crimson/osd/osd_operations/snaptrim_event.cc
@@ -363,6 +363,7 @@ SnapTrimObjSubEvent::remove_or_update(
       // save head snapset
       logger().debug("{}: {} new snapset {} on {}",
                     *this, coid, head_obc->ssc->snapset, head_obc->obs.oi);
+      osd_op_p.at_version.version++;
       if (head_obc->ssc->snapset.clones.empty() && head_obc->obs.oi.is_whiteout()) {
        remove_head_whiteout(obc, head_obc, txn);
       } else {

diff --git a/src/crimson/osd/osd_operations/snaptrim_event.h b/src/crimson/osd/osd_operations/snaptrim_event.h
index 88a2a0392ea1e3142d5673005a2cc8ce139a779f..06d8f43c2f3c93b3bdbfe569b9d222809674a4ba 100644 (file)
--- a/src/crimson/osd/osd_operations/snaptrim_event.h
+++ b/src/crimson/osd/osd_operations/snaptrim_event.h
@@ -155,7 +155,6 @@ private:
       rid,
       mt,
       return_code);
-    osd_op_p.at_version.version++;
     return log_entries.back();
   }