From b7cbd6a341cea4e33468409b8accd6c6cb80d3fc Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Sun, 8 Sep 2024 12:55:23 +0800 Subject: [PATCH] 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 --- src/crimson/osd/osd_operations/snaptrim_event.cc | 1 + src/crimson/osd/osd_operations/snaptrim_event.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crimson/osd/osd_operations/snaptrim_event.cc b/src/crimson/osd/osd_operations/snaptrim_event.cc index 7ae90937672..7512b3d108d 100644 --- 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 88a2a0392ea..06d8f43c2f3 100644 --- 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(); } -- 2.39.5