Merge pull request ceph#64361 from soumyakoduri/wip-skoduri-zoneparams-vers

 rgw: Fix the version of restore_pool and dedup_pool

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Author: cbodley

src/rgw/rgw_zone.h

@@ -98,8 +98,8 @@ struct RGWZoneParams {
     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);
   }
 
@@ -190,14 +190,14 @@ struct RGWZoneParams {
       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);
   }