From: Greg Farnum Date: Wed, 15 Jan 2014 22:51:35 +0000 (-0800) Subject: OSDMonitor: make sure we don't send out maps with a primary_temp mapping X-Git-Tag: v0.78~329^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1086%2Fhead;p=ceph.git OSDMonitor: make sure we don't send out maps with a primary_temp mapping Making sure a cluster supports primary_temp is complicated and we don't have any of the machinery in place right now (nor a need to actually support it). We don't have any mechanisms for setting it to begin with, so assert that we never create anything with any such mapping in update_from_paxos() to catch any errors. Signed-off-by: Greg Farnum --- diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 3f5af18024b..50f999d59f9 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -248,6 +248,10 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap) osd_epoch.erase(p++); } + /** we don't have any of the feature bit infrastructure in place for + * supporting primary_temp mappings without breaking old clients/OSDs.*/ + assert(osdmap.primary_temp->empty()); + if (mon->is_leader()) { // kick pgmon, make sure it's seen the latest map mon->pgmon()->check_osd_map(osdmap.epoch);