]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Don't set backfill_toofull in RemoteReservationRevoked path
authorDavid Zafman <dzafman@redhat.com>
Fri, 23 Aug 2019 15:52:39 +0000 (08:52 -0700)
committerDavid Zafman <dzafman@redhat.com>
Fri, 23 Aug 2019 18:29:18 +0000 (11:29 -0700)
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>
src/osd/PeeringState.cc

index 4ede256e2523d924cb627c422f3c02f3148d76a0..e5c28694955a562dc54295516782c2205e898236 100644 (file)
@@ -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>();
 }