From: Douglas Fuller <dfuller@redhat.com>
Date: Mon, 17 Jul 2017 21:14:49 +0000 (-0400)
Subject: messages: Add optional data pool to MStatfs
X-Git-Tag: v12.1.3~24^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=575d613e619cdf288db272b0d12311214126f803;p=ceph.git

messages: Add optional data pool to MStatfs

Bump encoding version accordingly.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
---

diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h
index bf7560d0734..a27ef9b5427 100644
--- a/src/messages/MStatfs.h
+++ b/src/messages/MStatfs.h
@@ -20,12 +20,19 @@
 #include "messages/PaxosServiceMessage.h"
 
 class MStatfs : public PaxosServiceMessage {
+
+  static const int HEAD_VERSION = 2;
+  static const int COMPAT_VERSION = 0;
+
 public:
   uuid_d fsid;
+  boost::optional<int64_t> data_pool;
 
-  MStatfs() : PaxosServiceMessage(CEPH_MSG_STATFS, 0) {}
-  MStatfs(const uuid_d& f, ceph_tid_t t, version_t v) :
-    PaxosServiceMessage(CEPH_MSG_STATFS, v), fsid(f) {
+  MStatfs() : PaxosServiceMessage(CEPH_MSG_STATFS, 0, HEAD_VERSION) {}
+  MStatfs(const uuid_d& f, ceph_tid_t t, boost::optional<int64_t> _data_pool,
+	      version_t v) : PaxosServiceMessage(CEPH_MSG_STATFS, v,
+                                            HEAD_VERSION, COMPAT_VERSION),
+					         fsid(f), data_pool(_data_pool) {
     set_tid(t);
   }
 
@@ -35,17 +42,24 @@ private:
 public:
   const char *get_type_name() const override { return "statfs"; }
   void print(ostream& out) const override {
-    out << "statfs(" << get_tid() << " v" << version << ")";
+    out << "statfs(" << get_tid() << " pool "
+        << (data_pool ? *data_pool : -1) << " v" << version << ")";
   }
 
   void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
+    ::encode(data_pool, payload);
   }
   void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
+    if (header.version >= 2) {
+      ::decode(data_pool, p);
+    } else {
+      data_pool = boost::optional<int64_t> ();
+    }
   }
 };