From 85ddc1a0345c24487f85103dd6a4b9a4dad87e2b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 26 Jun 2019 14:30:07 -0500 Subject: [PATCH] mon/OSDMonitor: record last_purged_snaps_scrub from beacon to osdmap Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 19dab91add3..2abc2fb438a 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3831,7 +3831,18 @@ bool OSDMonitor::prepare_beacon(MonOpRequestRef op) for (const auto& pg : beacon->pgs) { last_epoch_clean.report(pg, beacon->min_last_epoch_clean); } - return false; + + if (osdmap.osd_xinfo[from].last_purged_snaps_scrub < + beacon->last_purged_snaps_scrub) { + if (pending_inc.new_xinfo.count(from) == 0) { + pending_inc.new_xinfo[from] = osdmap.osd_xinfo[from]; + } + pending_inc.new_xinfo[from].last_purged_snaps_scrub = + beacon->last_purged_snaps_scrub; + return true; + } else { + return false; + } } // --------------- -- 2.39.5