From: Sage Weil <sage@redhat.com>
Date: Tue, 4 Apr 2017 17:58:33 +0000 (-0400)
Subject: mon/MgrMonitor: encode MgrMap with mon quroum features
X-Git-Tag: v12.0.2~166^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d88f0fdb39158440e5d0b771fb43a28efca8dc8f;p=ceph.git

mon/MgrMonitor: encode MgrMap with mon quroum features

Fixes: http://tracker.ceph.com/issues/19491
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index cdca72a110d9..6e73827030e1 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -70,7 +70,7 @@ void MgrMonitor::encode_pending(MonitorDBStore::TransactionRef t)
 {
   dout(10) << __func__ << " " << pending_map << dendl;
   bufferlist bl;
-  pending_map.encode(bl, 0);
+  pending_map.encode(bl, mon->get_quorum_con_features());
   put_version(t, pending_map.epoch, bl);
   put_last_committed(t, pending_map.epoch);
 }