From 828060749ad1221f71ce03b10be52089b8aa7b4c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 2 Jan 2018 16:36:27 -0600 Subject: [PATCH] osd/PGPeeringEvent: note mon- vs peer-initiated pg creates Signed-off-by: Sage Weil --- src/messages/MOSDPGLog.h | 3 ++- src/osd/OSD.cc | 3 ++- src/osd/PGPeeringEvent.h | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h index 821fb063c6b..892faf72289 100644 --- a/src/messages/MOSDPGLog.h +++ b/src/messages/MOSDPGLog.h @@ -62,7 +62,8 @@ public: get_spg(), epoch, info.history, - past_intervals)); + past_intervals, + false)); } MOSDPGLog() : MOSDPeeringOp(MSG_OSD_PG_LOG, HEAD_VERSION, COMPAT_VERSION) { diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index be039ef55a9..67a17acc7c6 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -8615,7 +8615,8 @@ void OSD::handle_fast_pg_notify(MOSDPGNotify* m) pgid, p.first.query_epoch, p.first.info.history, - p.second) + p.second, + false) ))); } } diff --git a/src/osd/PGPeeringEvent.h b/src/osd/PGPeeringEvent.h index 0248d160c80..a3236de64fb 100644 --- a/src/osd/PGPeeringEvent.h +++ b/src/osd/PGPeeringEvent.h @@ -15,10 +15,12 @@ struct PGCreateInfo { epoch_t epoch = 0; pg_history_t history; PastIntervals past_intervals; + bool by_mon; PGCreateInfo(spg_t p, epoch_t e, const pg_history_t& h, - const PastIntervals& pi) - : pgid(p), epoch(e), history(h), past_intervals(pi) {} + const PastIntervals& pi, + bool mon) + : pgid(p), epoch(e), history(h), past_intervals(pi), by_mon(mon) {} }; class PGPeeringEvent { -- 2.39.5