From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Feb 2019 22:41:44 +0000 (-0600)
Subject: messages/MMonMgrReport: fix compat decoding
X-Git-Tag: v14.1.0~138^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26392%2Fhead;p=ceph.git

messages/MMonMgrReport: fix compat decoding

Broken by 08d1a6fc3c57ccbeb6dff8fce1aae429edca97f3

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

diff --git a/src/messages/MMonMgrReport.h b/src/messages/MMonMgrReport.h
index 8ca5ed232fbe..ec5ea7aafa64 100644
--- a/src/messages/MMonMgrReport.h
+++ b/src/messages/MMonMgrReport.h
@@ -52,16 +52,16 @@ public:
     paxos_encode();
     encode(health_checks, payload);
     encode(service_map_bl, payload);
-    if (header.version >= 2) {
-      encode(progress_events, payload);
-    }
+    encode(progress_events, payload);
   }
   void decode_payload() override {
     auto p = payload.cbegin();
     paxos_decode(p);
     decode(health_checks, p);
     decode(service_map_bl, p);
-    decode(progress_events, p);
+    if (header.version >= 2) {
+      decode(progress_events, p);
+    }
   }
 };