]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Don't print spurious error on `radosgw-admin` exit 62766/head
authorAdam C. Emerson <aemerson@redhat.com>
Thu, 10 Apr 2025 16:06:21 +0000 (12:06 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Thu, 10 Apr 2025 16:07:54 +0000 (12:07 -0400)
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>
src/rgw/driver/rados/rgw_datalog.cc

index 438430634649a61934b8aa8b46ac4c99511556e3..d6ed19f20b462a999b48b5fee22bf126ddf14e57 100644 (file)
@@ -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)