From: Matan Breizman <mbreizma@redhat.com>
Date: Mon, 24 Apr 2023 12:56:18 +0000 (+0000)
Subject: crimson/osd/pg: PG::on_active_actmap() clear PG_STATE_SNAPTRIM_ERROR
X-Git-Tag: v18.1.0~55^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F51674%2Fhead;p=ceph.git

crimson/osd/pg: PG::on_active_actmap() clear PG_STATE_SNAPTRIM_ERROR

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit ad129f39e75ed9a128c5bc2bc52d575a01f1b0ea)
---

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 56bc99778335..fc2981990e52 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -489,7 +489,10 @@ void PG::on_active_actmap()
         logger().debug("{}: trimmed snap={}", *this, trimmed);
       });
     }).finally([this] {
+      logger().debug("{}: PG::on_active_actmap() finished trimming",
+                     *this);
       peering_state.state_clear(PG_STATE_SNAPTRIM);
+      peering_state.state_clear(PG_STATE_SNAPTRIM_ERROR);
       publish_stats_to_osd();
     });
 }