From: Adam C. Emerson <aemerson@redhat.com>
Date: Thu, 5 Jun 2025 17:09:36 +0000 (-0400)
Subject: rgw/multisite: Don't rerun recovery periodically
X-Git-Tag: v20.1.1~119^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F64765%2Fhead;p=ceph.git

rgw/multisite: Don't rerun recovery periodically

Recovery is so conservative it creates many, many datalog entries,
slowing sync.

Fixes: https://tracker.ceph.com/issues/71465
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit eb686df10f1b9dc474a26ebc9b4fc3891b9d330b)

Fixes: https://tracker.ceph.com/issues/72174
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_datalog.cc b/src/rgw/driver/rados/rgw_datalog.cc
index 6cf00adc73e9..d68ce48aec79 100644
--- a/src/rgw/driver/rados/rgw_datalog.cc
+++ b/src/rgw/driver/rados/rgw_datalog.cc
@@ -1464,11 +1464,6 @@ asio::awaitable<void> RGWDataChangesLog::renew_run(decltype(renew_signal)) {
 	++run;
       }
 
-      if (ceph::mono_clock::now() - last_recovery < 6h)  {
-	co_await recover(&dp, recovery_signal);
-      };
-
-
       int interval = cct->_conf->rgw_data_log_window * 3 / 4;
       renew_timer->expires_after(std::chrono::seconds(interval));
       co_await renew_timer->async_wait(asio::use_awaitable);