From: Aishwarya Mathuria <amathuri@redhat.com>
Date: Tue, 29 Mar 2022 18:05:45 +0000 (+0530)
Subject: osd/osd_types: Increasing decode version of scrub_duration in pg stats
X-Git-Tag: v18.0.0~1154^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3532b78901cc43ceb375da34a681e5a0f8eb53ac;p=ceph-ci.git

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 <amathuri@redhat.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 6d9cb19d832..3c304794926 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -3119,9 +3119,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);
     }