mon/OSDMonitor: remove workaround for dumpling-era bug

We will definitely have published (and stored) a new osdmap since then.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-12-08 22:06:51 -06:00
parent cf39776a2d
commit c2535c1363

View File

@ -164,16 +164,6 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap)
if (latest_full == 0 && get_first_committed() > 1)
latest_full = get_first_committed();
if (latest_full > 0) {
// make sure we can really believe get_version_latest_full(); see
// 76cd7ac1c2094b34ad36bea89b2246fa90eb2f6d
bufferlist test;
get_version_full(latest_full, test);
if (test.length() == 0) {
dout(10) << __func__ << " ignoring recorded latest_full as it is missing; fallback to search" << dendl;
latest_full = 0;
}
}
if (get_first_committed() > 1 &&
latest_full < get_first_committed()) {
/* a bug introduced in 7fb3804fb860dcd0340dd3f7c39eec4315f8e4b6 would lead