From f2bdd9a0b48c0e0daff0ec2d9c54faa879440c4d Mon Sep 17 00:00:00 2001
From: Ali Masarwa <amasarwa@redhat.com>
Date: Sun, 6 Apr 2025 15:11:13 +0300
Subject: [PATCH] RGW/standalone: fix issue emerged when vstart-ing cluster

Signed-off-by: Ali Masarwa <amasarwa@redhat.com>
---
 src/rgw/driver/rados/rgw_service.cc | 4 ++--
 src/rgw/services/svc_mdlog.cc       | 3 ++-
 src/rgw/services/svc_mdlog.h        | 2 +-
 src/rgw/services/svc_zone.cc        | 2 +-
 src/rgw/services/svc_zone.h         | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/rgw/driver/rados/rgw_service.cc b/src/rgw/driver/rados/rgw_service.cc
index da38c2b4c56..bc3e92c7e6b 100644
--- a/src/rgw/driver/rados/rgw_service.cc
+++ b/src/rgw/driver/rados/rgw_service.cc
@@ -64,9 +64,9 @@ int RGWServices_Def::init(CephContext *cct,
   cls = std::make_unique<RGWSI_Cls>(cct);
   config_key_rados = std::make_unique<RGWSI_ConfigKey_RADOS>(cct);
   datalog_rados = std::make_unique<RGWDataChangesLog>(cct);
-  mdlog = std::make_unique<RGWSI_MDLog>(cct, run_sync);
+  mdlog = std::make_unique<RGWSI_MDLog>(cct, run_sync, cfgstore);
   notify = std::make_unique<RGWSI_Notify>(cct);
-  zone = std::make_unique<RGWSI_Zone>(cct);
+  zone = std::make_unique<RGWSI_Zone>(cct, cfgstore);
   zone_utils = std::make_unique<RGWSI_ZoneUtils>(cct);
   quota = std::make_unique<RGWSI_Quota>(cct);
   sync_modules = std::make_unique<RGWSI_SyncModules>(cct);
diff --git a/src/rgw/services/svc_mdlog.cc b/src/rgw/services/svc_mdlog.cc
index 885ea349e74..b8f86c61a01 100644
--- a/src/rgw/services/svc_mdlog.cc
+++ b/src/rgw/services/svc_mdlog.cc
@@ -25,7 +25,8 @@ using namespace std;
 using Svc = RGWSI_MDLog::Svc;
 using Cursor = RGWPeriodHistory::Cursor;
 
-RGWSI_MDLog::RGWSI_MDLog(CephContext *cct, bool _run_sync) : RGWServiceInstance(cct), run_sync(_run_sync) {
+RGWSI_MDLog::RGWSI_MDLog(CephContext *cct, bool _run_sync, rgw::sal::ConfigStore* _cfgstore) : RGWServiceInstance(cct),
+              run_sync(_run_sync), cfgstore(_cfgstore) {
 }
 
 RGWSI_MDLog::~RGWSI_MDLog() {
diff --git a/src/rgw/services/svc_mdlog.h b/src/rgw/services/svc_mdlog.h
index a466abd47d7..a3f833a55db 100644
--- a/src/rgw/services/svc_mdlog.h
+++ b/src/rgw/services/svc_mdlog.h
@@ -53,7 +53,7 @@ class RGWSI_MDLog : public RGWServiceInstance
   rgw::sal::ConfigStore* cfgstore{nullptr};
 
 public:
-  RGWSI_MDLog(CephContext *cct, bool run_sync);
+  RGWSI_MDLog(CephContext *cct, bool run_sync, rgw::sal::ConfigStore* _cfgstore);
   virtual ~RGWSI_MDLog();
 
   librados::Rados* rados{nullptr};
diff --git a/src/rgw/services/svc_zone.cc b/src/rgw/services/svc_zone.cc
index 099a127acae..3303a38aef3 100644
--- a/src/rgw/services/svc_zone.cc
+++ b/src/rgw/services/svc_zone.cc
@@ -20,7 +20,7 @@
 using namespace std;
 using namespace rgw_zone_defaults;
 
-RGWSI_Zone::RGWSI_Zone(CephContext *cct) : RGWServiceInstance(cct)
+RGWSI_Zone::RGWSI_Zone(CephContext *cct, rgw::sal::ConfigStore* _cfgstore) : RGWServiceInstance(cct), cfgstore(_cfgstore)
 {
 }
 
diff --git a/src/rgw/services/svc_zone.h b/src/rgw/services/svc_zone.h
index 18edde37138..20e357919c4 100644
--- a/src/rgw/services/svc_zone.h
+++ b/src/rgw/services/svc_zone.h
@@ -79,7 +79,7 @@ class RGWSI_Zone : public RGWServiceInstance
                              rgw::sal::ConfigStore* cfgstore,
                              optional_yield y);
 public:
-  RGWSI_Zone(CephContext *cct);
+  RGWSI_Zone(CephContext *cct, rgw::sal::ConfigStore* cfgstore);
   ~RGWSI_Zone();
 
   const RGWZoneParams& get_zone_params() const;
-- 
2.39.5