]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: move reshard pool to ns in log pool
authorAbhishek Lekshmanan <abhishek@suse.com>
Mon, 17 Jul 2017 11:59:51 +0000 (13:59 +0200)
committerAbhishek Lekshmanan <abhishek@suse.com>
Mon, 17 Jul 2017 13:52:48 +0000 (15:52 +0200)
Since the pool was introduced only in Luminous dev and RC releases we
can probably upgrade without the need to bump up the the struct version
numbers. This needs a pending release notes entry

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
src/rgw/rgw_rados.h

index 6b996c960bfbfb886bf098babdeec958aa6ea41a..1c4311be75c62c889f8bfd2a2e468e3c6e9f95c0 100644 (file)
@@ -1266,7 +1266,7 @@ struct RGWZoneParams : RGWSystemMetaObj {
     if (struct_v >= 10) {
       ::decode(reshard_pool, bl);
     } else {
-      reshard_pool = name + ".rgw.reshard";
+      reshard_pool = log_pool.name + ":reshard";
     }
     DECODE_FINISH(bl);
   }