]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon: remove an incomplete and unnecessary wait_for_readable() bailout
authorGreg Farnum <gfarnum@redhat.com>
Thu, 30 Sep 2021 18:08:00 +0000 (18:08 +0000)
committerGreg Farnum <gfarnum@redhat.com>
Thu, 30 Sep 2021 18:08:57 +0000 (18:08 +0000)
Not sure how this got in here[1], but without a return statement it's not
functioning, and it's happily unnecessary as we don't reference the OSDMap.
[1]: We do CRUSH parsing and I was probably expecting to compare it to the
actual map at some point during development, but that's not happening.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/mon/MonmapMonitor.cc

index ade6624d415db0b6d0e3698e7e1da2bb907d6d5b..35cf2bca89ce135eca6bc37f9b5f2d42914e5da5 100644 (file)
@@ -1020,9 +1020,6 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
       goto reply;
     }
 
-    if (!mon.osdmon()->is_readable()) {
-      mon.osdmon()->wait_for_readable(op, new Monitor::C_RetryMessage(&mon, op));
-    }
     vector<string> argvec;
     map<string, string> loc;
     cmd_getval(cmdmap, "args", argvec);