]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp 37171/head
authorGreg Farnum <gfarnum@redhat.com>
Wed, 12 Aug 2020 23:44:11 +0000 (23:44 +0000)
committerNeha Ojha <nojha@redhat.com>
Tue, 15 Sep 2020 23:59:20 +0000 (23:59 +0000)
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)

src/mon/OSDMonitor.cc

index 36f8976bcb870ccc45a11e0da621f4dbb266fbb8..ce7812ac5c8c67d254f2b1bdd5a4f441f9ccaca9 100644 (file)
@@ -3848,6 +3848,7 @@ bool OSDMonitor::preprocess_pgtemp(MonOpRequestRef op)
   return true;
 
  ignore:
+  mon->no_reply(op);
   return true;
 }