From 6524341db6d111251ec6b3ffa15b97c31fad6b89 Mon Sep 17 00:00:00 2001 From: Aishwarya Mathuria Date: Tue, 29 Mar 2022 23:35:45 +0530 Subject: [PATCH] osd/osd_types: Increasing decode version of scrub_duration in pg stats All new fields added to pg stats after quincy RC need to have the decode field bumped up to avoid decoding errors during an upgrade from quincy RC to the quincy stable version Fixes: https://tracker.ceph.com/issues/53923 Signed-off-by: Aishwarya Mathuria (cherry picked from commit 3532b78901cc43ceb375da34a681e5a0f8eb53ac) --- src/osd/osd_types.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index a87e732ef47e5..e794d78a2a909 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -3112,9 +3112,9 @@ void pg_stat_t::decode(ceph::buffer::list::const_iterator &bl) decode(tmp, bl); scrub_sched_status.m_is_periodic = tmp; decode(objects_scrubbed, bl); - decode(scrub_duration, bl); } if (struct_v >= 28) { + decode(scrub_duration, bl); decode(objects_trimmed, bl); decode(snaptrim_duration, bl); } -- 2.39.5