]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD.cc: handle_fast_pg_create cleanup 48296/head
authorMatan Breizman <mbreizma@redhat.com>
Wed, 19 Oct 2022 07:31:16 +0000 (07:31 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Wed, 19 Oct 2022 07:31:16 +0000 (07:31 +0000)
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>
src/osd/OSD.cc

index e162bded15ec98faf3feec40c1c5e49bc786ae4c..57d4485936fbf64fb4e3f5387ed606a84a6a5aee 100644 (file)
@@ -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