messages/MOSDBeacon: add last_epoch_clean support

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/messages/MOSDBeacon.h b/src/messages/MOSDBeacon.h
index e431fce090d430bf2364b1cb283a70a1987248d6..b8b083899f4917b2d2ca4a02c4f315374840b6ff 100644 (file)
--- a/src/messages/MOSDBeacon.h
+++ b/src/messages/MOSDBeacon.h
@@ -1,19 +1,36 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #pragma once
 
 class MOSDBeacon : public PaxosServiceMessage {
 public:
-  MOSDBeacon(epoch_t e = 0)
-    : PaxosServiceMessage(MSG_OSD_BEACON, e)
-    {}
+  std::vector<pg_t> pgs;
+  epoch_t min_last_epoch_clean = 0;
+
+  MOSDBeacon()
+    : PaxosServiceMessage(MSG_OSD_BEACON, 0)
+  {}
+  MOSDBeacon(epoch_t e, epoch_t min_lec)
+    : PaxosServiceMessage(MSG_OSD_BEACON, e),
+      min_last_epoch_clean(min_lec)
+  {}
   void encode_payload(uint64_t features) override {
     paxos_encode();
+    ::encode(pgs, payload);
+    ::encode(min_last_epoch_clean, payload);
   }
   void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
+    ::decode(pgs, p);
+    ::decode(min_last_epoch_clean, p);
   }
   const char *get_type_name() const override { return "osd_beacon"; }
   void print(ostream &out) const {
-    out << get_type_name();
+    out << get_type_name()
+        << "(pgs " << pgs
+        << " lec " << min_last_epoch_clean
+        << " v" << version << ")";
   }
 };