From: David Zafman <dzafman@redhat.com>
Date: Thu, 22 Aug 2019 17:30:01 +0000 (-0700)
Subject: osd: Rename MBackfillReserve::TOOFULL to what it does in particular (revoke)
X-Git-Tag: v15.1.0~1733^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7810ee584cc0fe9ca1b819d2a807dfc7cd13d292;p=ceph.git

osd: Rename MBackfillReserve::TOOFULL to what it does in particular (revoke)

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

diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h
index d3e469c8ab2..6926b21f992 100644
--- a/src/messages/MBackfillReserve.h
+++ b/src/messages/MBackfillReserve.h
@@ -31,7 +31,7 @@ public:
     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
-    TOOFULL = 4,   // replica->primary: too full, stop backfilling
+    REVOKE_TOOFULL = 4,   // replica->primary: too full, stop backfilling
     REVOKE = 5,    // replica->primary: i'm taking back the slot i gave you
     // (*) NOTE: prior to luminous, REJECT was overloaded to also mean release
   };
@@ -77,7 +77,7 @@ public:
 	query_epoch,
 	query_epoch,
 	RemoteReservationCanceled());
-    case TOOFULL:
+    case REVOKE_TOOFULL:
       return new PGPeeringEvent(
 	query_epoch,
 	query_epoch,
@@ -124,8 +124,8 @@ public:
     case RELEASE:
       out << "RELEASE";
       break;
-    case TOOFULL:
-      out << "TOOFULL";
+    case REVOKE_TOOFULL:
+      out << "REVOKE_TOOFULL";
       break;
     case REVOKE:
       out << "REVOKE";
@@ -158,7 +158,7 @@ public:
       header.compat_version = 3;
       encode(pgid.pgid, payload);
       encode(query_epoch, payload);
-      encode((type == RELEASE || type == TOOFULL || type == REVOKE) ?
+      encode((type == RELEASE || type == REVOKE_TOOFULL || type == REVOKE) ?
 	       REJECT : type, payload);
       encode(priority, payload);
       encode(pgid.shard, payload);
diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index e5c28694955..99c664f7fe7 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -4884,7 +4884,7 @@ PeeringState::RepRecovering::react(const BackfillTooFull &)
   pl->send_cluster_message(
     ps->primary.osd,
     new MBackfillReserve(
-      MBackfillReserve::TOOFULL,
+      MBackfillReserve::REVOKE_TOOFULL,
       spg_t(ps->info.pgid.pgid, ps->primary.shard),
       ps->get_osdmap_epoch()),
     ps->get_osdmap_epoch());