osd/PGPeeringEvent: note mon- vs peer-initiated pg creates

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h
index 821fb063c6b0d039398193678c420ddcd07d4964..892faf72289d681397756df8bbff01f90bd6fd64 100644 (file)
--- 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 be039ef55a97cf69e054ad84a1929aa31002693f..67a17acc7c6ac8372ff7a3e7ce93b7520988c604 100644 (file)
--- 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 0248d160c808e7f28308bb7b5cc3884b9d4e7d56..a3236de64fb69247a14e79e51d14a75a2e4b216f 100644 (file)
--- 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 {