From: Kefu Chai <kchai@redhat.com>
Date: Thu, 11 Mar 2021 09:45:49 +0000 (+0800)
Subject: mon/OSDMonitor: do not return no_reply() again
X-Git-Tag: v15.2.13~10^2~15^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c290d82357d0d8bf722e377e7c65a38ac6e17885;p=ceph.git

mon/OSDMonitor: do not return no_reply() again

we always return "no_op" message to proxy monitor in
`OSDMonitor::prepare_failure()` at the very beginning of this method. so
no need to reply the peon again when discarding the failure report.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 062a3859b989069b2120678db1787cb077e51bd3)

 Conflicts:
	src/mon/OSDMonitor.cc
	because mon-> in master is mon. in octopus
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index fa26252362f..20dfac17db5 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3257,11 +3257,7 @@ bool OSDMonitor::prepare_failure(MonOpRequestRef op)
 		      << m->get_orig_source();
 
     failure_info_t& fi = failure_info[target_osd];
-    MonOpRequestRef old_op = fi.add_report(reporter, failed_since, op);
-    if (old_op) {
-      mon->no_reply(old_op);
-    }
-
+    fi.add_report(reporter, failed_since, op);
     return check_failure(now, target_osd, fi);
   } else {
     // remove the report
@@ -3270,10 +3266,7 @@ bool OSDMonitor::prepare_failure(MonOpRequestRef op)
 		       << m->get_orig_source();
     if (failure_info.count(target_osd)) {
       failure_info_t& fi = failure_info[target_osd];
-      MonOpRequestRef report_op = fi.cancel_report(reporter);
-      if (report_op) {
-        mon->no_reply(report_op);
-      }
+      fi.cancel_report(reporter);
       if (fi.reporters.empty()) {
 	dout(10) << " removing last failure_info for osd." << target_osd
 		 << dendl;