messages/MBackfillReserve: rename CANCEL -> RELEASE

This way me match the terminology used by MRecoveryReserve.  It is also
a bit more suggestive of primary->replica action, whereas "cancel" could
mean replica canceling its grant.

Document the meaning in the headers to clarify meaning.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h
index 89d3c9ff33d75d3db98c327bb06a3c68dd48ef70..a0e1276bb329c23dc59d483299ed31f77d48ffac 100644 (file)
--- a/src/messages/MBackfillReserve.h
+++ b/src/messages/MBackfillReserve.h
@@ -24,10 +24,11 @@ public:
   spg_t pgid;
   epoch_t query_epoch;
   enum {
-    REQUEST = 0,
-    GRANT = 1,
-    REJECT = 2,
-    CANCEL = 3,
+    REQUEST = 0,   // primary->replica: please reserve a slot
+    GRANT = 1,     // replica->primary: ok, i reserved it
+    REJECT = 2,    // replica->primary: sorry, try again later (*)
+    RELEASE = 3,   // primary->replcia: release the slot i reserved before
+    // (*) NOTE: prior to luminous, REJECT was overloaded to also mean release
   };
   uint32_t type;
   uint32_t priority;
@@ -58,8 +59,8 @@ public:
     case REJECT:
       out << "REJECT ";
       break;
-    case CANCEL:
-      out << "CANCEL ";
+    case RELEASE:
+      out << "RELEASE ";
       break;
     }
     out << " pgid: " << pgid << ", query_epoch: " << query_epoch;
@@ -82,7 +83,7 @@ public:
       header.compat_version = 3;
       ::encode(pgid.pgid, payload);
       ::encode(query_epoch, payload);
-      ::encode(type == CANCEL ? REJECT : type, payload);
+      ::encode(type == RELEASE ? REJECT : type, payload);
       ::encode(priority, payload);
       ::encode(pgid.shard, payload);
       return;

diff --git a/src/messages/MRecoveryReserve.h b/src/messages/MRecoveryReserve.h
index f42ff80543fdde2726c406cd33b128e3f8dc36da..bd7a851bc8b352b42600710475c98bae8531c7cc 100644 (file)
--- a/src/messages/MRecoveryReserve.h
+++ b/src/messages/MRecoveryReserve.h
@@ -24,9 +24,9 @@ public:
   spg_t pgid;
   epoch_t query_epoch;
   enum {
-    REQUEST = 0,
-    GRANT = 1,
-    RELEASE = 2,
+    REQUEST = 0,   // primary->replica: please reserve slot
+    GRANT = 1,     // replica->primary: ok, i reserved it
+    RELEASE = 2,   // primary->replica: release the slot i reserved before
   };
   uint32_t type;
   uint32_t priority = 0;

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index bf4421e6d8b9961a04185f084b7d532b75b7d707..7ad5a770fa66a664af27bacf52cbf9bedd058356 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8555,7 +8555,7 @@ void OSD::handle_pg_backfill_reserve(OpRequestRef op)
        m->query_epoch,
        m->query_epoch,
        PG::RemoteReservationRejected()));
-  } else if (m->type == MBackfillReserve::CANCEL) {
+  } else if (m->type == MBackfillReserve::RELEASE) {
     evt = PG::CephPeeringEvtRef(
       new PG::CephPeeringEvt(
        m->query_epoch,

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index fb7b5142dcadf426e7df231c985596619f0fe58b..128c2a4a57ce40031ceee2e8b4863969717ed424 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6345,7 +6345,7 @@ PG::RecoveryState::Backfilling::react(const DeferBackfill &c)
     if (con) {
       pg->osd->send_message_osd_cluster(
         new MBackfillReserve(
-         MBackfillReserve::CANCEL,
+         MBackfillReserve::RELEASE,
          spg_t(pg->info.pgid.pgid, it->shard),
          pg->get_osdmap()->get_epoch()),
        con.get());
@@ -6377,7 +6377,7 @@ PG::RecoveryState::Backfilling::react(const UnfoundBackfill &c)
     if (con) {
       pg->osd->send_message_osd_cluster(
         new MBackfillReserve(
-         MBackfillReserve::CANCEL,
+         MBackfillReserve::RELEASE,
          spg_t(pg->info.pgid.pgid, it->shard),
          pg->get_osdmap()->get_epoch()),
        con.get());
@@ -6405,7 +6405,7 @@ PG::RecoveryState::Backfilling::react(const RemoteReservationRejected &)
     if (con) {
       pg->osd->send_message_osd_cluster(
         new MBackfillReserve(
-         MBackfillReserve::CANCEL,
+         MBackfillReserve::RELEASE,
          spg_t(pg->info.pgid.pgid, it->shard),
          pg->get_osdmap()->get_epoch()),
        con.get());
@@ -6498,7 +6498,7 @@ PG::RecoveryState::WaitRemoteBackfillReserved::react(const RemoteReservationReje
     if (con) {
       pg->osd->send_message_osd_cluster(
         new MBackfillReserve(
-       MBackfillReserve::CANCEL,
+       MBackfillReserve::RELEASE,
        spg_t(pg->info.pgid.pgid, it->shard),
        pg->get_osdmap()->get_epoch()),
       con.get());