From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Fri, 9 Jun 2023 17:32:27 +0000 (+0000)
Subject: crimson/osd: suppress the assertion in Watch::notify_ack
X-Git-Tag: v18.2.1~176^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=28c5f2e619d7315f9bdacf906b532499f0790cb9;p=ceph.git

crimson/osd: suppress the assertion in Watch::notify_ack

Replaced the assert with an error log entry but ultimately
this commit should be reverted.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 76bfae9491134671a40976b4e6fc06d6f7e01306)
---

diff --git a/src/crimson/osd/watch.cc b/src/crimson/osd/watch.cc
index bc8da71c882ae..f99b7c726c14a 100644
--- a/src/crimson/osd/watch.cc
+++ b/src/crimson/osd/watch.cc
@@ -125,7 +125,12 @@ seastar::future<> Watch::notify_ack(
   logger().debug("{} gid={} cookie={} notify_id={}",
                  __func__,  get_watcher_gid(), get_cookie(), notify_id);
   const auto it = in_progress_notifies.find(notify_id);
-  assert(it != std::end(in_progress_notifies));
+  if (it == std::end(in_progress_notifies)) {
+    logger().error("{} notify_id={} not found on the in-progess list."
+                   " Supressing but this should not happen.",
+                   __func__, notify_id);
+    return seastar::now();
+  }
   auto notify = *it;
   logger().debug("Watch::notify_ack gid={} cookie={} found notify(id={})",
     get_watcher_gid(),