From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 30 Sep 2021 18:08:00 +0000 (+0000)
Subject: mon: remove an incomplete and unnecessary wait_for_readable() bailout
X-Git-Tag: v17.1.0~738^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=38825ff73b6ce9ad330b4580831a39928926e698;p=ceph-ci.git

mon: remove an incomplete and unnecessary wait_for_readable() bailout

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>
---

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index ade6624d415..35cf2bca89c 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -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);