From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 6 Mar 2025 15:41:39 +0000 (-0500)
Subject: rgw: sync fairness watcher reconnects on any error
X-Git-Tag: testing/wip-pdonnell-testing-20250324.181635-debug~48^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8dbcb175e46fc63a5efa40c03cea49dceba40e26;p=ceph-ci.git

rgw: sync fairness watcher reconnects on any error

other implementations of librados::WatchCtx2 in radosgw reconnect the
watch on any error code, not just -ENOTCONN

Fixes: https://tracker.ceph.com/issues/70270

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/driver/rados/sync_fairness.cc b/src/rgw/driver/rados/sync_fairness.cc
index 1ac27f4bacc..a54a6ab2f15 100644
--- a/src/rgw/driver/rados/sync_fairness.cc
+++ b/src/rgw/driver/rados/sync_fairness.cc
@@ -219,10 +219,9 @@ class Watcher : public librados::WatchCtx2 {
     if (cookie != handle) {
       return;
     }
-    if (err == -ENOTCONN) {
-      ldpp_dout(dpp, 4) << "Disconnected watch on " << ref.obj << dendl;
-      restart();
-    }
+    ldpp_dout(dpp, 4) << "Disconnected watch on " << ref.obj
+        << " err=" << err << dendl;
+    restart();
   }
 }; // Watcher