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>
(cherry picked from commit 8dbcb175e46fc63a5efa40c03cea49dceba40e26)

diff --git a/src/rgw/driver/rados/sync_fairness.cc b/src/rgw/driver/rados/sync_fairness.cc
index 1ac27f4bacc883e3b89605f29a46d2d348b62607..a54a6ab2f153ae85df2f407cde5038b4f7d45a11 100644 (file)
--- 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