]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp 37347/head
authorGreg Farnum <gfarnum@redhat.com>
Wed, 12 Aug 2020 23:44:11 +0000 (23:44 +0000)
committerNathan Cutler <ncutler@suse.com>
Wed, 23 Sep 2020 11:47:40 +0000 (13:47 +0200)
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 e256d10aa57af0fbf5655b7bf5eb21c5f1a07fa7..c32f257d74851665f923176c9976494dc0d7a12a 100644 (file)
@@ -4050,6 +4050,7 @@ bool OSDMonitor::preprocess_pgtemp(MonOpRequestRef op)
   return true;
 
  ignore:
+  mon->no_reply(op);
   return true;
 }