From 86190327a0c19ba5c786e3ff8e671c6462ccdcc5 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 25 Oct 2018 16:46:30 -0400 Subject: [PATCH] rgw: RADOS::Pool::lookup() uses Pool's pool name Signed-off-by: Casey Bodley --- src/rgw/services/svc_rados.cc | 2 +- src/rgw/services/svc_rados.h | 2 +- src/rgw/services/svc_zone.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rgw/services/svc_rados.cc b/src/rgw/services/svc_rados.cc index 772eb6fde2a..43d58d0ec87 100644 --- a/src/rgw/services/svc_rados.cc +++ b/src/rgw/services/svc_rados.cc @@ -285,7 +285,7 @@ int RGWSI_RADOS::Pool::create(const vector& pools, vector *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()); diff --git a/src/rgw/services/svc_rados.h b/src/rgw/services/svc_rados.h index 3dddb30d11e..0f63e64b9da 100644 --- a/src/rgw/services/svc_rados.h +++ b/src/rgw/services/svc_rados.h @@ -116,7 +116,7 @@ public: Pool() {} int create(const std::vector& pools, std::vector *retcodes); - int lookup(const rgw_pool& pool); + int lookup(); struct List { Pool& pool; diff --git a/src/rgw/services/svc_zone.cc b/src/rgw/services/svc_zone.cc index 799089571e6..3b95a450046 100644 --- a/src/rgw/services/svc_zone.cc +++ b/src/rgw/services/svc_zone.cc @@ -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; } -- 2.39.5