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: v13.2.9~111^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ac3fa76bd657c742e93954e20fa23e1670767e62;p=ceph.git

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

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 7810ee584cc0fe9ca1b819d2a807dfc7cd13d292)

Conflicts:
	src/osd/PeeringState.cc
- file does not exist in nautilus due to refactoring: made the changes manually
  to src/osd/PG.cc
---

diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h
index f5268d5208f4d..76db7027252a3 100644
--- a/src/messages/MBackfillReserve.h
+++ b/src/messages/MBackfillReserve.h
@@ -29,7 +29,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
   };
@@ -73,7 +73,7 @@ public:
 	query_epoch,
 	query_epoch,
 	RemoteReservationCanceled());
-    case TOOFULL:
+    case REVOKE_TOOFULL:
       return new PGPeeringEvent(
 	query_epoch,
 	query_epoch,
@@ -116,8 +116,8 @@ public:
     case RELEASE:
       out << "RELEASE";
       break;
-    case TOOFULL:
-      out << "TOOFULL";
+    case REVOKE_TOOFULL:
+      out << "REVOKE_TOOFULL";
       break;
     case REVOKE:
       out << "REVOKE";
@@ -143,7 +143,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/PG.cc b/src/osd/PG.cc
index e98ff4a141608..ace92bd571927 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -7585,7 +7585,7 @@ PG::RecoveryState::RepRecovering::react(const BackfillTooFull &)
   pg->osd->send_message_osd_cluster(
     pg->primary.osd,
     new MBackfillReserve(
-      MBackfillReserve::TOOFULL,
+      MBackfillReserve::REVOKE_TOOFULL,
       spg_t(pg->info.pgid.pgid, pg->primary.shard),
       pg->get_osdmap()->get_epoch()),
     pg->get_osdmap()->get_epoch());