From: Matan Breizman <mbreizma@redhat.com>
Date: Wed, 19 Oct 2022 07:31:16 +0000 (+0000)
Subject: osd/OSD.cc: handle_fast_pg_create cleanup
X-Git-Tag: v18.1.0~737^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c548af138c0c5fbb5ed615869bc277ba60e88a1;p=ceph.git

osd/OSD.cc: handle_fast_pg_create cleanup

No pg history case is for pre-octopus releases, we no longer send MOSDPGCreate without pg_extra.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e162bded15ec..57d4485936fb 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8970,25 +8970,9 @@ void OSD::handle_fast_pg_create(MOSDPGCreate2 *m)
     utime_t created_stamp = p.second.second;
     auto q = m->pg_extra.find(pgid);
     if (q == m->pg_extra.end()) {
-      dout(20) << __func__ << " " << pgid << " e" << created
-	       << "@" << created_stamp
-	       << " (no history or past_intervals)" << dendl;
-      // pre-octopus ... no pg history.  this can be removed in Q release.
-      enqueue_peering_evt(
-	pgid,
-	PGPeeringEventRef(
-	  std::make_shared<PGPeeringEvent>(
-	    m->epoch,
-	    m->epoch,
-	    NullEvt(),
-	    true,
-	    new PGCreateInfo(
-	      pgid,
-	      created,
-	      pg_history_t(created, created_stamp),
-	      PastIntervals(),
-	      true)
-	    )));
+      clog->error() << __func__ << " " << pgid << " e" << created
+                    << "@" << created_stamp << " with no history or past_intervals"
+                    << ", this should be impossible after octopus.  Ignoring.";
     } else {
       dout(20) << __func__ << " " << pgid << " e" << created
 	       << "@" << created_stamp