From: Soumya Koduri <skoduri@redhat.com>
Date: Fri, 17 Apr 2026 11:12:13 +0000 (+0530)
Subject: rgw/cloud-restore: Correct the restore svc shutdown order
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cf99589b9dda3230e367cc112c415680b1f8a38b;p=ceph.git

rgw/cloud-restore: Correct the restore svc shutdown order

Stop restore worker threads prior to obj_expirer and other services
(svc) shutdown which they rely on.

Signed-off-by: Soumya Koduri <skoduri@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc
index 505a43a7940d..504fd9b2e58d 100644
--- a/src/rgw/driver/rados/rgw_rados.cc
+++ b/src/rgw/driver/rados/rgw_rados.cc
@@ -1127,6 +1127,11 @@ void RGWRados::finalize()
   }
   delete sync_tracer;
   
+  if (use_restore_thread) {
+    restore->stop_processor();
+  }
+  restore = NULL;
+
   delete lc;
   lc = NULL; 
 
@@ -1168,10 +1173,6 @@ void RGWRados::finalize()
     rgw::bucketlogging::shutdown();
   }
 
-  if (use_restore_thread) {
-    restore->stop_processor();
-  }
-  restore = NULL;
   delete index_completion_manager;
 }