From c12ed2906a14d3feb7a23058e420c3837f8f8894 Mon Sep 17 00:00:00 2001
From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 7 Sep 2022 10:22:14 -0400
Subject: [PATCH] rgw/main: move service_map_meta into AppMain

The RGWRealmReloader holds a reference on it.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---
 src/rgw/rgw_appmain.cc | 1 -
 src/rgw/rgw_main.h     | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rgw/rgw_appmain.cc b/src/rgw/rgw_appmain.cc
index 66867636a11..95d3ee18526 100644
--- a/src/rgw/rgw_appmain.cc
+++ b/src/rgw/rgw_appmain.cc
@@ -381,7 +381,6 @@ int rgw::AppMain::init_frontends2(RGWLib* rgwlib)
     g_conf().get_val<string>("rgw_frontend_defaults");
   get_str_vec(frontend_defs_str, ",", frontends_def);
 
-  std::map<std::string, std::string> service_map_meta;
   service_map_meta["pid"] = stringify(getpid());
 
   std::map<std::string, std::unique_ptr<RGWFrontendConfig> > fe_def_map;
diff --git a/src/rgw/rgw_main.h b/src/rgw/rgw_main.h
index 3acd1198c7d..bcd45badf66 100644
--- a/src/rgw/rgw_main.h
+++ b/src/rgw/rgw_main.h
@@ -68,6 +68,7 @@ class AppMain {
   std::unique_ptr<rgw::auth::ImplicitTenants> implicit_tenant_context;
   std::unique_ptr<rgw::dmclock::SchedulerCtx> sched_ctx;
   std::unique_ptr<ActiveRateLimiter> ratelimiter;
+  std::map<std::string, std::string> service_map_meta;
   // wow, realm reloader has a lot of parts
   std::unique_ptr<RGWRealmReloader> reloader;
   std::unique_ptr<RGWPeriodPusher> pusher;
-- 
2.39.5