]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MgrMonitor: encode MgrMap with mon quroum features
authorSage Weil <sage@redhat.com>
Tue, 4 Apr 2017 17:58:33 +0000 (13:58 -0400)
committerSage Weil <sage@redhat.com>
Tue, 4 Apr 2017 17:58:33 +0000 (13:58 -0400)
Fixes: http://tracker.ceph.com/issues/19491
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/MgrMonitor.cc

index cdca72a110d94bef16bb2fd309d50d596e76fc8b..6e73827030e158a8850e3abc4689323e91509a7a 100644 (file)
@@ -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);
 }