From: David Zafman <dzafman@redhat.com>
Date: Fri, 23 Aug 2019 15:52:39 +0000 (-0700)
Subject: osd: Don't set backfill_toofull in RemoteReservationRevoked path
X-Git-Tag: v15.1.0~1733^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa569ecfecc43ce685b29e0456f62cb085788f25;p=ceph.git

osd: Don't set backfill_toofull in RemoteReservationRevoked path

We shouldn't set backfill_toofull when a revoke occurs in the non-toofull
case.

Fixes: https://tracker.ceph.com/issues/41255

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 4ede256e252..e5c28694955 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -4553,7 +4553,6 @@ void PeeringState::WaitRemoteBackfillReserved::retry()
   }
 
   ps->state_clear(PG_STATE_BACKFILL_WAIT);
-  ps->state_set(PG_STATE_BACKFILL_TOOFULL);
   pl->publish_stats_to_osd();
 
   pl->schedule_event_after(
@@ -4567,6 +4566,8 @@ void PeeringState::WaitRemoteBackfillReserved::retry()
 boost::statechart::result
 PeeringState::WaitRemoteBackfillReserved::react(const RemoteReservationRejected &evt)
 {
+  DECLARE_LOCALS;
+  ps->state_set(PG_STATE_BACKFILL_TOOFULL);
   retry();
   return transit<NotBackfilling>();
 }