From dc123a735b0ed45999fcb3969711fbd264f0c472 Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Sun, 6 Jul 2025 22:28:22 +0530 Subject: [PATCH] rgw: Fix the version of struct RGWZoneParams Fix the version of `restore_pool` and `dedup_pool` to be compatible with earlier releases. Signed-off-by: Soumya Koduri (cherry picked from commit b6fc0be439f79f2aef833d703f7a6f9c2e48de02) --- src/rgw/driver/rados/rgw_zone.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rgw/driver/rados/rgw_zone.h b/src/rgw/driver/rados/rgw_zone.h index eacb305848706..f99b813c2a9f4 100644 --- a/src/rgw/driver/rados/rgw_zone.h +++ b/src/rgw/driver/rados/rgw_zone.h @@ -185,8 +185,8 @@ struct RGWZoneParams : RGWSystemMetaObj { encode(topics_pool, bl); encode(account_pool, bl); encode(group_pool, bl); - encode(dedup_pool, bl); encode(restore_pool, bl); + encode(dedup_pool, bl); ENCODE_FINISH(bl); } @@ -270,14 +270,14 @@ struct RGWZoneParams : RGWSystemMetaObj { group_pool = name + ".rgw.meta:groups"; } if (struct_v >= 16) { - decode(dedup_pool, bl); + decode(restore_pool, bl); } else { - dedup_pool = name + ".rgw.dedup"; + restore_pool = log_pool.name + ":restore"; } if (struct_v >= 17) { - decode(restore_pool, bl); + decode(dedup_pool, bl); } else { - restore_pool = log_pool.name + ":restore"; + dedup_pool = name + ".rgw.dedup"; } DECODE_FINISH(bl); } -- 2.39.5