update sources to 12.2.2

[ceph.git] / ceph / src / osd / Watch.cc

diff --git a/ceph/src/osd/Watch.cc b/ceph/src/osd/Watch.cc
index df92bb7712c451e9718877722309fd0b631fbada..7ff9f99b2bfab5929a52b7409279d20cccb5d09d 100644 (file)
--- a/ceph/src/osd/Watch.cc
+++ b/ceph/src/osd/Watch.cc
@@ -124,9 +124,9 @@ void Notify::register_cb()
   {
     osd->watch_lock.Lock();
     cb = new NotifyTimeoutCB(self.lock());
-    osd->watch_timer.add_event_after(
-      timeout,
-      cb);
+    if (!osd->watch_timer.add_event_after(timeout, cb)) {
+      cb = nullptr;
+    }
     osd->watch_lock.Unlock();
   }
 }
@@ -333,9 +333,9 @@ void Watch::register_cb()
     dout(15) << "registering callback, timeout: " << timeout << dendl;
   }
   cb = new HandleWatchTimeout(self.lock());
-  osd->watch_timer.add_event_after(
-    timeout,
-    cb);
+  if (!osd->watch_timer.add_event_after(timeout, cb)) {
+    cb = nullptr;
+  }
 }
 
 void Watch::unregister_cb()