From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 17 Jul 2017 11:59:51 +0000 (+0200)
Subject: rgw: move reshard pool to ns in log pool
X-Git-Tag: v12.1.2~226^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=365f3215cce45aa49438873b7cfbafd733c1698d;p=ceph.git

rgw: move reshard pool to ns in log pool

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>
---

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 6b996c960bfb..1c4311be75c6 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -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);
   }