]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/osd_types: Increasing decode version of scrub_duration in pg stats 45695/head
authorAishwarya Mathuria <amathuri@redhat.com>
Tue, 29 Mar 2022 18:05:45 +0000 (23:35 +0530)
committerAishwarya Mathuria <amathuri@redhat.com>
Tue, 29 Mar 2022 18:45:17 +0000 (00:15 +0530)
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>
(cherry picked from commit 3532b78901cc43ceb375da34a681e5a0f8eb53ac)

src/osd/osd_types.cc

index a87e732ef47e516a70ce36c5c751b5ff425bc574..e794d78a2a909f21163c5b792cad0a640d80b17d 100644 (file)
@@ -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);
     }