]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #50070 from xxhdx1985126/wip-sync-peering-backfill
authorSamuel Just <sjust@redhat.com>
Mon, 13 Feb 2023 20:44:51 +0000 (12:44 -0800)
committerGitHub <noreply@github.com>
Mon, 13 Feb 2023 20:44:51 +0000 (12:44 -0800)
crimson/osd/pg: synchronize processing of peering events and backfill

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>
1  2 
src/crimson/osd/pg.cc
src/crimson/osd/pg.h

index 1688ee17731ed133a54cef0e6d2166c34deeefe4,a9ca03d5987fc36265ff3a3c11c1fbe7110d2f68..5a254948410a6f0f388ab671aa393d1d40ae4ad8
  #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;
Simple merge