message/MMonProbe: reencode monmap for non-addr2 clients

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

diff --git a/src/messages/MMonProbe.h b/src/messages/MMonProbe.h
index 2f8a60b347c6bdecd01c85de4532acb8ae4d5277..abe53a0bc087a3ebf173b3ff06a9b777a769c8c1 100644 (file)
--- a/src/messages/MMonProbe.h
+++ b/src/messages/MMonProbe.h
@@ -90,7 +90,9 @@ public:
   }
   
   void encode_payload(uint64_t features) {
-    if (monmap_bl.length() && (features & CEPH_FEATURE_MONENC) == 0) {
+    if (monmap_bl.length() &&
+       ((features & CEPH_FEATURE_MONENC) == 0 ||
+        (features & CEPH_FEATURE_MSG_ADDR2) == 0)) {
       // reencode old-format monmap
       MonMap t;
       t.decode(monmap_bl);