osd: Rename backfill reservation reject names to reflect too full use

The only reason for a reject is in a too full condition.  Now that we
have two types of revoke, let's make this clearer.

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

diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h
index 6926b21f992a0a3e4eb7694fa9f23014475f0275..e431a52b81011e98f9e8e83e693562eaf1183a4e 100644 (file)
--- a/src/messages/MBackfillReserve.h
+++ b/src/messages/MBackfillReserve.h
@@ -29,7 +29,7 @@ public:
   enum {
     REQUEST = 0,   // primary->replica: please reserve a slot
     GRANT = 1,     // replica->primary: ok, i reserved it
-    REJECT = 2,    // replica->primary: sorry, try again later (*)
+    REJECT_TOOFULL = 2,    // replica->primary: too full, sorry, try again later (*)
     RELEASE = 3,   // primary->replcia: release the slot i reserved before
     REVOKE_TOOFULL = 4,   // replica->primary: too full, stop backfilling
     REVOKE = 5,    // replica->primary: i'm taking back the slot i gave you
@@ -62,7 +62,7 @@ public:
        query_epoch,
        query_epoch,
        RemoteBackfillReserved());
-    case REJECT:
+    case REJECT_TOOFULL:
       // NOTE: this is replica -> primary "i reject your request"
       //      and also primary -> replica "cancel my previously-granted request"
       //                                  (for older peers)
@@ -71,7 +71,7 @@ public:
       return new PGPeeringEvent(
        query_epoch,
        query_epoch,
-       RemoteReservationRejected());
+       RemoteReservationRejectedTooFull());
     case RELEASE:
       return new PGPeeringEvent(
        query_epoch,
@@ -118,8 +118,8 @@ public:
     case GRANT:
       out << "GRANT";
       break;
-    case REJECT:
-      out << "REJECT ";
+    case REJECT_TOOFULL:
+      out << "REJECT_TOOFULL";
       break;
     case RELEASE:
       out << "RELEASE";
@@ -159,7 +159,7 @@ public:
       encode(pgid.pgid, payload);
       encode(query_epoch, payload);
       encode((type == RELEASE || type == REVOKE_TOOFULL || type == REVOKE) ?
-              REJECT : type, payload);
+              REJECT_TOOFULL : type, payload);
       encode(priority, payload);
       encode(pgid.shard, payload);
       return;

diff --git a/src/osd/PGPeeringEvent.h b/src/osd/PGPeeringEvent.h
index 762967e169da784682003b3a25377506f82bf0bd..f38cb7750f8a8aff28c3f08570b40ce8cf8bb092 100644 (file)
--- a/src/osd/PGPeeringEvent.h
+++ b/src/osd/PGPeeringEvent.h
@@ -162,7 +162,7 @@ struct RequestRecoveryPrio : boost::statechart::event< RequestRecoveryPrio > {
 
 TrivialEvent(NullEvt)
 TrivialEvent(RemoteBackfillReserved)
-TrivialEvent(RemoteReservationRejected)
+TrivialEvent(RemoteReservationRejectedTooFull)
 TrivialEvent(RemoteReservationRevokedTooFull)
 TrivialEvent(RemoteReservationRevoked)
 TrivialEvent(RemoteReservationCanceled)

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 99c664f7fe780ffc32dc41b5a24d85e6c95085b1..d16c28f045c80c5669d45d7c2d639b25c3a8b9c0 100644 (file)
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -1186,7 +1186,7 @@ void PeeringState::reject_reservation()
   pl->send_cluster_message(
     primary.osd,
     new MBackfillReserve(
-      MBackfillReserve::REJECT,
+      MBackfillReserve::REJECT_TOOFULL,
       spg_t(info.pgid.pgid, primary.shard),
       get_osdmap_epoch()),
     get_osdmap_epoch());
@@ -4564,7 +4564,7 @@ void PeeringState::WaitRemoteBackfillReserved::retry()
 }
 
 boost::statechart::result
-PeeringState::WaitRemoteBackfillReserved::react(const RemoteReservationRejected &evt)
+PeeringState::WaitRemoteBackfillReserved::react(const RemoteReservationRejectedTooFull &evt)
 {
   DECLARE_LOCALS;
   ps->state_set(PG_STATE_BACKFILL_TOOFULL);
@@ -4627,7 +4627,7 @@ PeeringState::NotBackfilling::react(const RemoteBackfillReserved &evt)
 }
 
 boost::statechart::result
-PeeringState::NotBackfilling::react(const RemoteReservationRejected &evt)
+PeeringState::NotBackfilling::react(const RemoteReservationRejectedTooFull &evt)
 {
   return discard_event();
 }
@@ -4671,11 +4671,11 @@ PeeringState::RepNotRecovering::RepNotRecovering(my_context ctx)
 }
 
 boost::statechart::result
-PeeringState::RepNotRecovering::react(const RejectRemoteReservation &evt)
+PeeringState::RepNotRecovering::react(const RejectTooFullRemoteReservation &evt)
 {
   DECLARE_LOCALS;
   ps->reject_reservation();
-  post_event(RemoteReservationRejected());
+  post_event(RemoteReservationRejectedTooFull());
   return discard_event();
 }
 
@@ -4744,7 +4744,7 @@ PeeringState::RepNotRecovering::react(const RequestBackfillPrio &evt)
 
   if (!pl->try_reserve_recovery_space(
        evt.primary_num_bytes, evt.local_num_bytes)) {
-    post_event(RejectRemoteReservation());
+    post_event(RejectTooFullRemoteReservation());
   } else {
     PGPeeringEventRef preempt;
     if (HAVE_FEATURE(ps->upacting_features, RECOVERY_RESERVATION_2)) {
@@ -4819,17 +4819,17 @@ PeeringState::RepWaitBackfillReserved::react(const RemoteBackfillReserved &evt)
 
 boost::statechart::result
 PeeringState::RepWaitBackfillReserved::react(
-  const RejectRemoteReservation &evt)
+  const RejectTooFullRemoteReservation &evt)
 {
   DECLARE_LOCALS;
   ps->reject_reservation();
-  post_event(RemoteReservationRejected());
+  post_event(RemoteReservationRejectedTooFull());
   return discard_event();
 }
 
 boost::statechart::result
 PeeringState::RepWaitBackfillReserved::react(
-  const RemoteReservationRejected &evt)
+  const RemoteReservationRejectedTooFull &evt)
 {
   DECLARE_LOCALS;
   pl->unreserve_recovery_space();

diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index e84638f68c48cfcfa7380e722d53a727f3382a66..ed95e82c08aa5695f667591a7e399499dd50c1ac 100644 (file)
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -480,7 +480,7 @@ public:
   TrivialEvent(NeedUpThru)
   TrivialEvent(Backfilled)
   TrivialEvent(LocalBackfillReserved)
-  TrivialEvent(RejectRemoteReservation)
+  TrivialEvent(RejectTooFullRemoteReservation)
   TrivialEvent(RequestBackfill)
   TrivialEvent(RemoteRecoveryPreempted)
   TrivialEvent(RemoteBackfillPreempted)
@@ -870,12 +870,12 @@ public:
       boost::statechart::custom_reaction< Backfilled >,
       boost::statechart::custom_reaction< DeferBackfill >,
       boost::statechart::custom_reaction< UnfoundBackfill >,
-      boost::statechart::custom_reaction< RemoteReservationRejected >,
+      boost::statechart::custom_reaction< RemoteReservationRejectedTooFull >,
       boost::statechart::custom_reaction< RemoteReservationRevokedTooFull>,
       boost::statechart::custom_reaction< RemoteReservationRevoked>
       > reactions;
     explicit Backfilling(my_context ctx);
-    boost::statechart::result react(const RemoteReservationRejected& evt) {
+    boost::statechart::result react(const RemoteReservationRejectedTooFull& evt) {
       // for compat with old peers
       post_event(RemoteReservationRevokedTooFull());
       return discard_event();
@@ -893,7 +893,7 @@ public:
   struct WaitRemoteBackfillReserved : boost::statechart::state< WaitRemoteBackfillReserved, Active >, NamedState {
     typedef boost::mpl::list<
       boost::statechart::custom_reaction< RemoteBackfillReserved >,
-      boost::statechart::custom_reaction< RemoteReservationRejected >,
+      boost::statechart::custom_reaction< RemoteReservationRejectedTooFull >,
       boost::statechart::custom_reaction< RemoteReservationRevoked >,
       boost::statechart::transition< AllBackfillsReserved, Backfilling >
       > reactions;
@@ -902,7 +902,7 @@ public:
     void retry();
     void exit();
     boost::statechart::result react(const RemoteBackfillReserved& evt);
-    boost::statechart::result react(const RemoteReservationRejected& evt);
+    boost::statechart::result react(const RemoteReservationRejectedTooFull& evt);
     boost::statechart::result react(const RemoteReservationRevoked& evt);
   };
 
@@ -918,12 +918,12 @@ public:
     typedef boost::mpl::list<
       boost::statechart::transition< RequestBackfill, WaitLocalBackfillReserved>,
       boost::statechart::custom_reaction< RemoteBackfillReserved >,
-      boost::statechart::custom_reaction< RemoteReservationRejected >
+      boost::statechart::custom_reaction< RemoteReservationRejectedTooFull >
       > reactions;
     explicit NotBackfilling(my_context ctx);
     void exit();
     boost::statechart::result react(const RemoteBackfillReserved& evt);
-    boost::statechart::result react(const RemoteReservationRejected& evt);
+    boost::statechart::result react(const RemoteReservationRejectedTooFull& evt);
   };
 
   struct NotRecovering : boost::statechart::state< NotRecovering, Active>, NamedState {
@@ -1003,7 +1003,7 @@ public:
     typedef boost::mpl::list<
       boost::statechart::transition< RecoveryDone, RepNotRecovering >,
       // for compat with old peers
-      boost::statechart::transition< RemoteReservationRejected, RepNotRecovering >,
+      boost::statechart::transition< RemoteReservationRejectedTooFull, RepNotRecovering >,
       boost::statechart::transition< RemoteReservationCanceled, RepNotRecovering >,
       boost::statechart::custom_reaction< BackfillTooFull >,
       boost::statechart::custom_reaction< RemoteRecoveryPreempted >,
@@ -1019,15 +1019,15 @@ public:
   struct RepWaitBackfillReserved : boost::statechart::state< RepWaitBackfillReserved, ReplicaActive >, NamedState {
     typedef boost::mpl::list<
       boost::statechart::custom_reaction< RemoteBackfillReserved >,
-      boost::statechart::custom_reaction< RejectRemoteReservation >,
-      boost::statechart::custom_reaction< RemoteReservationRejected >,
+      boost::statechart::custom_reaction< RejectTooFullRemoteReservation >,
+      boost::statechart::custom_reaction< RemoteReservationRejectedTooFull >,
       boost::statechart::custom_reaction< RemoteReservationCanceled >
       > reactions;
     explicit RepWaitBackfillReserved(my_context ctx);
     void exit();
     boost::statechart::result react(const RemoteBackfillReserved &evt);
-    boost::statechart::result react(const RejectRemoteReservation &evt);
-    boost::statechart::result react(const RemoteReservationRejected &evt);
+    boost::statechart::result react(const RejectTooFullRemoteReservation &evt);
+    boost::statechart::result react(const RemoteReservationRejectedTooFull &evt);
     boost::statechart::result react(const RemoteReservationCanceled &evt);
   };
 
@@ -1035,13 +1035,13 @@ public:
     typedef boost::mpl::list<
       boost::statechart::custom_reaction< RemoteRecoveryReserved >,
       // for compat with old peers
-      boost::statechart::custom_reaction< RemoteReservationRejected >,
+      boost::statechart::custom_reaction< RemoteReservationRejectedTooFull >,
       boost::statechart::custom_reaction< RemoteReservationCanceled >
       > reactions;
     explicit RepWaitRecoveryReserved(my_context ctx);
     void exit();
     boost::statechart::result react(const RemoteRecoveryReserved &evt);
-    boost::statechart::result react(const RemoteReservationRejected &evt) {
+    boost::statechart::result react(const RemoteReservationRejectedTooFull &evt) {
       // for compat with old peers
       post_event(RemoteReservationCanceled());
       return discard_event();
@@ -1053,8 +1053,8 @@ public:
     typedef boost::mpl::list<
       boost::statechart::custom_reaction< RequestRecoveryPrio >,
       boost::statechart::custom_reaction< RequestBackfillPrio >,
-      boost::statechart::custom_reaction< RejectRemoteReservation >,
-      boost::statechart::transition< RemoteReservationRejected, RepNotRecovering >,
+      boost::statechart::custom_reaction< RejectTooFullRemoteReservation >,
+      boost::statechart::transition< RemoteReservationRejectedTooFull, RepNotRecovering >,
       boost::statechart::transition< RemoteReservationCanceled, RepNotRecovering >,
       boost::statechart::custom_reaction< RemoteRecoveryReserved >,
       boost::statechart::custom_reaction< RemoteBackfillReserved >,
@@ -1071,7 +1071,7 @@ public:
       // my reservation completion raced with a RELEASE from primary
       return discard_event();
     }
-    boost::statechart::result react(const RejectRemoteReservation &evt);
+    boost::statechart::result react(const RejectTooFullRemoteReservation &evt);
     void exit();
   };