summaryrefslogtreecommitdiff
path: root/src/mon
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-06-21 07:31:47 -0700
committerSamuel Just <sam.just@inktank.com>2012-06-21 17:10:30 -0700
commit77d836c5b80e29111fbf0220183f0f40d1550ac6 (patch)
tree5dc4cc5e3f51713006606cd2791e273cd1409e07 /src/mon
parentde5b32365981570adbfede9011e04023c7d60421 (diff)
downloadceph-77d836c5b80e29111fbf0220183f0f40d1550ac6.tar.gz
mon: encoding new monmap using quorum feature set
It is probably unlikely that someone will expand the mon cluster with a mixed feature set, but we know the quorum features here, so we should use them. Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/mon')
-rw-r--r--src/mon/MonmapMonitor.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 845bbbdbfc9..d07714cd9a6 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -100,7 +100,7 @@ void MonmapMonitor::encode_pending(bufferlist& bl)
assert(mon->monmap->epoch + 1 == pending_map.epoch ||
pending_map.epoch == 1); // special case mkfs!
- pending_map.encode(bl, CEPH_FEATURES_ALL);
+ pending_map.encode(bl, mon->get_quorum_features());
}
void MonmapMonitor::on_active()