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 <skoduri@redhat.com>
(cherry picked from commit b6fc0be439f79f2aef833d703f7a6f9c2e48de02)

diff --git a/src/rgw/driver/rados/rgw_zone.h b/src/rgw/driver/rados/rgw_zone.h
index eacb305848706027c3e7fcb0f4dca97bb71bb4b3..f99b813c2a9f4faa72511dbc67236d8375c63523 100644 (file)
--- 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);
   }