rgw/main: remove friends, see_also

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

diff --git a/src/common/options/rgw.yaml.in b/src/common/options/rgw.yaml.in
index 024d9f172791f504b4139a70bb8b92c44f844c7c..a8cf381fe1927e71c186134f0218fd272d3b02bc 100644 (file)
--- a/src/common/options/rgw.yaml.in
+++ b/src/common/options/rgw.yaml.in
@@ -1164,6 +1164,8 @@ options:
   services:
   - rgw
   with_legacy: true
+  see_also:
+  - rgw_frontends
 - name: rgw_rados_pool_autoscale_bias
   type: float
   level: advanced

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 303a4f0351af8bf977c67e0dd12861e3e13a9330..b7fad4a989c79419eeb1372d7bbcccfe5e069119 100644 (file)
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -514,7 +514,7 @@ namespace rgw {
     common_init_finish(g_ceph_context);
 
     main.init_storage();
-    if (! main.store) {
+    if (! main.get_store()) {
       mutex.lock();
       init_timer.cancel_all_events();
       init_timer.shutdown();

diff --git a/src/rgw/rgw_lib.h b/src/rgw/rgw_lib.h
index 02ed8a0393d1fc6f33b0efe2323a371509ae78f9..600a7bcedcb85a37a3a28aa954e9aff232cb58d4 100644 (file)
--- a/src/rgw/rgw_lib.h
+++ b/src/rgw/rgw_lib.h
@@ -29,11 +29,11 @@ namespace rgw {
       {}
     ~RGWLib() {}
 
-    rgw::sal::Store* get_store() { return main.store; }
+    rgw::sal::Store* get_store() { return main.get_store(); }
 
     RGWLibFrontend* get_fe() { return fe; }
 
-    rgw::LDAPHelper* get_ldh() { return main.ldh.get(); }
+    rgw::LDAPHelper* get_ldh() { return main.get_ldh(); }
     CephContext *get_cct() const override { return cct.get(); }
     unsigned get_subsys() const { return ceph_subsys_rgw; }
     std::ostream& gen_prefix(std::ostream& out) const { return out << "lib rgw: "; }

diff --git a/src/rgw/rgw_main.h b/src/rgw/rgw_main.h
index d42729c745a31a02c3f0b0d14ad032f6a0d0b2b4..6ec7904c187ff35a7e49977b0745df47ed6d8a3f 100644 (file)
--- a/src/rgw/rgw_main.h
+++ b/src/rgw/rgw_main.h
@@ -78,9 +78,6 @@ namespace rgw {
     rgw::sal::Store* store;
     DoutPrefixProvider* dpp;
 
-    friend int main(int, char*[]); // doesnt work gcc-12.1
-    friend class RGWLib;
-
   public:
     AppMain(DoutPrefixProvider* dpp)
       : dpp(dpp)
@@ -92,6 +89,10 @@ namespace rgw {
       return store;
     }
 
+    rgw::LDAPHelper* get_ldh() {
+      return ldh.get();
+    }
+
     void init_frontends1(bool nfs = false);
     void init_numa();
     void init_storage();