From eb6b6e78676f7361def90d8fabeabb7690e0f3ab Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 18 Jun 2019 19:04:02 -0700
Subject: [PATCH] rgw: unitests and other tools fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---
 src/rgw/librgw.cc              | 4 +---
 src/rgw/librgw_admin_user.cc   | 2 --
 src/rgw/rgw_object_expirer.cc  | 3 ---
 src/test/test_rgw_admin_log.cc | 1 +
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index cee70455074..155ff857eaa 100644
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -550,8 +550,6 @@ namespace rgw {
     ldh->init();
     ldh->bind();
 
-    rgw_user_init(store);
-    rgw_bucket_init(store->meta_mgr);
     rgw_log_usage_init(g_ceph_context, store);
 
     // XXX ex-RGWRESTMgr_lib, mgr->set_logging(true)
@@ -629,7 +627,7 @@ namespace rgw {
 
   int RGWLibIO::set_uid(RGWRados *store, const rgw_user& uid)
   {
-    int ret = rgw_get_user_info_by_uid(store, uid, user_info, NULL);
+    int ret = store->ctl.user->get_info_by_uid(uid, &user_info);
     if (ret < 0) {
       derr << "ERROR: failed reading user info: uid=" << uid << " ret="
 	   << ret << dendl;
diff --git a/src/rgw/librgw_admin_user.cc b/src/rgw/librgw_admin_user.cc
index 928f04cb329..9ae8f703207 100644
--- a/src/rgw/librgw_admin_user.cc
+++ b/src/rgw/librgw_admin_user.cc
@@ -115,8 +115,6 @@ namespace rgw {
     init_timer.shutdown();
     mutex.Unlock();
 
-    rgw_user_init(store);
-
     init_async_signal_handler();
     register_async_signal_handler(SIGUSR1, handle_sigterm);
 
diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc
index 93258b4208b..07b917e6e85 100644
--- a/src/rgw/rgw_object_expirer.cc
+++ b/src/rgw/rgw_object_expirer.cc
@@ -87,9 +87,6 @@ int main(const int argc, const char **argv)
     return EIO;
   }
 
-  rgw_user_init(store);
-  rgw_bucket_init(store->meta_mgr);
-
   /* Guard to not forget about closing the rados store. */
   StoreDestructor store_dtor(store);
 
diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc
index 4204ee5c4d4..98097018646 100644
--- a/src/test/test_rgw_admin_log.cc
+++ b/src/test/test_rgw_admin_log.cc
@@ -33,6 +33,7 @@ extern "C"{
 #include "common/Finisher.h"
 #include "global/global_init.h"
 #include "rgw/rgw_common.h"
+#include "rgw/rgw_mdlog.h"
 #include "rgw/rgw_bucket.h"
 #include "rgw/rgw_rados.h"
 #include "include/utime.h"
-- 
2.39.5