]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp 36593/head
authorGreg Farnum <gfarnum@redhat.com>
Wed, 12 Aug 2020 23:44:11 +0000 (23:44 +0000)
committerGreg Farnum <gfarnum@redhat.com>
Thu, 20 Aug 2020 19:31:52 +0000 (19:31 +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>
src/mon/OSDMonitor.cc

index 41dc08c48e45b2f393cf3c7944e8646b3426b753..70d2f7cae45f40c54008ceab3403b039f63743ec 100644 (file)
@@ -4083,6 +4083,7 @@ bool OSDMonitor::preprocess_pgtemp(MonOpRequestRef op)
   return true;
 
  ignore:
+  mon->no_reply(op);
   return true;
 }