]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
messages/MMonMgrReport: fix compat decoding 26392/head
authorSage Weil <sage@redhat.com>
Tue, 12 Feb 2019 22:41:44 +0000 (16:41 -0600)
committerSage Weil <sage@redhat.com>
Tue, 12 Feb 2019 22:41:44 +0000 (16:41 -0600)
Broken by 08d1a6fc3c57ccbeb6dff8fce1aae429edca97f3

Signed-off-by: Sage Weil <sage@redhat.com>
src/messages/MMonMgrReport.h

index 8ca5ed232fbe0725b5864a88b3fb17eb8b0ee85c..ec5ea7aafa6498b8cea05416937f3010355fbee6 100644 (file)
@@ -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);
+    }
   }
 };