From: Adam C. Emerson <aemerson@redhat.com>
Date: Thu, 10 Apr 2025 16:06:21 +0000 (-0400)
Subject: rgw: Don't print spurious error on `radosgw-admin` exit
X-Git-Tag: v20.3.0~75^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59f73a5aafd1d3ded4f64800541ff43ee7974aba;p=ceph.git

rgw: Don't print spurious error on `radosgw-admin` exit

When debugging crashes related to `RGWDataChangesLog` shutdown, I
fixed the crashes, but broke the logic that decides whether to print
the error.

Fixes: https://tracker.ceph.com/issues/70864
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 438430634649..d6ed19f20b46 100644
--- a/src/rgw/driver/rados/rgw_datalog.cc
+++ b/src/rgw/driver/rados/rgw_datalog.cc
@@ -1357,10 +1357,13 @@ bool RGWDataChangesLog::going_down() const
 
 asio::awaitable<void> RGWDataChangesLog::shutdown() {
   DoutPrefix dp{cct, ceph_subsys_rgw, "Datalog Shutdown"};
-  if (down_flag || !ran_background) {
+  if (down_flag) {
     co_return;
   }
   down_flag = true;
+  if (!ran_background)  {
+    co_return;
+  }
   renew_stop();
   // Revisit this later
   if (renew_signal)