]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: RADOS::Pool::lookup() uses Pool's pool name
authorCasey Bodley <cbodley@redhat.com>
Thu, 25 Oct 2018 20:46:30 +0000 (16:46 -0400)
committerYehuda Sadeh <yehuda@redhat.com>
Thu, 8 Nov 2018 17:19:30 +0000 (09:19 -0800)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/services/svc_rados.cc
src/rgw/services/svc_rados.h
src/rgw/services/svc_zone.cc

index 772eb6fde2a760b9cb2cbccee94e963b41563465..43d58d0ec874644d32dd3505c0bfc1edb917334c 100644 (file)
@@ -285,7 +285,7 @@ int RGWSI_RADOS::Pool::create(const vector<rgw_pool>& pools, vector<int> *retcod
   return 0;
 }
 
-int RGWSI_RADOS::Pool::lookup(const rgw_pool& pool)
+int RGWSI_RADOS::Pool::lookup()
 {
   librados::Rados *rad = rados_svc->get_rados_handle(rados_handle);
   int ret = rad->pool_lookup(pool.name.c_str());
index 3dddb30d11e2829cf32b9bed6363a2a01241a6c6..0f63e64b9da16f746456ec7ee3ff935cead49ca4 100644 (file)
@@ -116,7 +116,7 @@ public:
     Pool() {}
 
     int create(const std::vector<rgw_pool>& pools, std::vector<int> *retcodes);
-    int lookup(const rgw_pool& pool);
+    int lookup();
 
     struct List {
       Pool& pool;
index 799089571e6f241855abac61078d6681a8725baf..3b95a4500467125be4eb3ead681890a59f605c8e 100644 (file)
@@ -1146,7 +1146,7 @@ int RGWSI_Zone::update_placement_map()
 
 int RGWSI_Zone::add_bucket_placement(const rgw_pool& new_pool)
 {
-  int ret = rados_svc->pool().lookup(new_pool);
+  int ret = rados_svc->pool(new_pool).lookup();
   if (ret < 0) { // DNE, or something
     return ret;
   }