From: John Spray <john.spray@redhat.com>
Date: Mon, 30 Apr 2018 15:31:27 +0000 (-0400)
Subject: librados: config mgrclient for pre-luminous cluster
X-Git-Tag: v13.1.1~51^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be23767b34bcfe83019a26243ddbae0dd2bb6778;p=ceph.git

librados: config mgrclient for pre-luminous cluster

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 8fd500d736bc3c868736537d04940c627587ec63)
---

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 06436be1835dc..a62da35f70ff3 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -311,6 +311,11 @@ int librados::RadosClient::connect()
   }
   messenger->set_myname(entity_name_t::CLIENT(monclient.get_global_id()));
 
+  // Detect older cluster, put mgrclient into compatible mode
+  mgrclient.set_mgr_optional(
+      !get_required_monitor_features().contains_all(
+        ceph::features::mon::FEATURE_LUMINOUS));
+
   // MgrClient needs this (it doesn't have MonClient reference itself)
   monclient.sub_want("mgrmap", 0, 0);
   monclient.renew_subs();