]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: remove workaround for dumpling-era bug 12403/head
authorSage Weil <sage@redhat.com>
Fri, 9 Dec 2016 04:06:51 +0000 (22:06 -0600)
committerSage Weil <sage@redhat.com>
Wed, 28 Dec 2016 19:10:08 +0000 (14:10 -0500)
We will definitely have published (and stored) a new osdmap since then.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index fb3157dd8f7365ca9804015f5b5dd50df4d1dd62..e9ca79fdeb758aa2da7a5a5dd7c3b3bbcf931c28 100644 (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