From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 20 Dec 2022 15:27:14 +0000 (+0000)
Subject: crimson/osd: handle PG_STATE_SNAPTRIM_ERROR when trimming snaps
X-Git-Tag: v18.1.0~260^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=38c030e2cb87fb027ea7a737ad0b1b20139e4349;p=ceph-ci.git

crimson/osd: handle PG_STATE_SNAPTRIM_ERROR when trimming snaps

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index c95da5c4851..6bab7c2cf81 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -452,11 +452,13 @@ Context *PG::on_clean()
 void PG::on_active_actmap()
 {
   logger().debug("{}: {} snap_trimq={}", *this, __func__, snap_trimq);
+  peering_state.state_clear(PG_STATE_SNAPTRIM_ERROR);
   std::ignore = seastar::do_until(
-    [this] { return snap_trimq.empty(); },
+    [this] { return snap_trimq.empty()
+                    && !peering_state.state_test(PG_STATE_SNAPTRIM_ERROR);
+    },
     [this] {
       peering_state.state_set(PG_STATE_SNAPTRIM);
-      peering_state.state_clear(PG_STATE_SNAPTRIM_ERROR);
       publish_stats_to_osd();
       const auto to_trim = snap_trimq.range_start();
       snap_trimq.erase(to_trim);
@@ -468,7 +470,16 @@ void PG::on_active_actmap()
           this,
           snap_mapper,
           to_trim,
-          needs_pause).second.handle_error(crimson::ct_error::assert_all{});
+          needs_pause
+        ).second.handle_error(
+          crimson::ct_error::enoent::handle([this] {
+            logger().error("{}: ENOENT saw, trimming stopped", *this);
+            peering_state.state_set(PG_STATE_SNAPTRIM_ERROR);
+            publish_stats_to_osd();
+            return seastar::make_ready_future<seastar::stop_iteration>(
+              seastar::stop_iteration::yes);
+          })
+        );
       }).then([this, trimmed=to_trim] {
         logger().debug("{}: trimmed snap={}", *this, trimmed);
       });