Merge pull request ceph#62888 from clwluvw/neorados-fifotrim

neorados: relax fifo trim error for ENODATA

Reviewed-by: Adam C. Emerson <[email protected]>

Author: cbodley

src/neorados/cls/fifo.h

@@ -1734,8 +1734,10 @@ class FIFO {
 		      sys::error_code{});
 	   co_return sys::error_code{};
 	 } catch (const sys::system_error& e) {
-	   ldpp_dout(dpp, -1) << __PRETTY_FUNCTION__ << ":" << __LINE__
-			      << " trim failed: " << e.what() << dendl;
+	   if (ceph::from_error_code(e.code()) != -ENODATA) {
+	     ldpp_dout(dpp, -1) << __PRETTY_FUNCTION__ << ":" << __LINE__
+	                        << " trim failed: " << e.what() << dendl;
+	   }
 	   co_return e.code();
 	 }
        }, rados.get_executor()),

src/rgw/driver/rados/rgw_datalog.cc

@@ -1260,26 +1260,23 @@ asio::awaitable<void> DataLogBackends::trim_entries(
 {
   auto [target_gen, cursor] = cursorgen(std::string{marker});
   std::unique_lock l(m);
+
   const auto head_gen = (end() - 1)->second->gen_id;
   const auto tail_gen = begin()->first;
- if (target_gen < tail_gen)
-   
+  if (target_gen < tail_gen)
     co_return;
-  auto r = 0;
+
   for (auto be = lower_bound(0)->second;
-       be->gen_id <= target_gen && be->gen_id <= head_gen && r >= 0;
+       be->gen_id <= target_gen && be->gen_id <= head_gen;
        be = upper_bound(be->gen_id)->second) {
     l.unlock();
     auto c = be->gen_id == target_gen ? cursor : be->max_marker();
     co_await be->trim(dpp, shard_id, c);
-    if (r == -ENOENT)
-      r = -ENODATA;
-    if (r == -ENODATA && be->gen_id < target_gen)
-      r = 0;
     if (be->gen_id == target_gen)
       break;
     l.lock();
   };
+
   co_return;
 }