From: Samuel Just <sjust@redhat.com>
Date: Mon, 13 Feb 2023 20:44:51 +0000 (-0800)
Subject: Merge pull request #50070 from xxhdx1985126/wip-sync-peering-backfill
X-Git-Tag: v18.1.0~387
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea33358e18f233ccba9f80a7b3d0a90b2fbb7549;p=ceph.git

Merge pull request #50070 from xxhdx1985126/wip-sync-peering-backfill

crimson/osd/pg: synchronize processing of peering events and backfill

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>
---

ea33358e18f233ccba9f80a7b3d0a90b2fbb7549
diff --cc src/crimson/osd/pg.cc
index 1688ee17731,a9ca03d5987..5a254948410
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@@ -37,9 -37,9 +37,10 @@@
  #include "crimson/osd/ops_executer.h"
  #include "crimson/osd/osd_operations/osdop_params.h"
  #include "crimson/osd/osd_operations/peering_event.h"
+ #include "crimson/osd/osd_operations/background_recovery.h"
  #include "crimson/osd/pg_recovery.h"
  #include "crimson/osd/replicated_recovery_backend.h"
 +#include "crimson/osd/watch.h"
  
  using std::ostream;
  using std::set;