From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 12 Aug 2020 23:44:11 +0000 (+0000)
Subject: mon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp
X-Git-Tag: v15.2.9~122^2~77^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37347%2Fhead;p=ceph.git

mon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp

If a message is forwarded, it's conceivable the leader's and peon's evaluation
will disagree about whether the message is useful or not, which could result
in the leader ignoring it and the peon having a dangling forwarded message.
Fix this by marking the op as no_reply whenever ignoring it.

Fixes:  https://tracker.ceph.com/issues/46914

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 73a014fc2ca928eb72def31c9e4177063cda421a)
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index e256d10aa57a..c32f257d7485 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4050,6 +4050,7 @@ bool OSDMonitor::preprocess_pgtemp(MonOpRequestRef op)
   return true;
 
  ignore:
+  mon->no_reply(op);
   return true;
 }