]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
OSD: don't clear peering_wait_for_split in advance_map()
authorSamuel Just <sam.just@inktank.com>
Sun, 3 Nov 2013 19:06:10 +0000 (11:06 -0800)
committerSage Weil <sage@inktank.com>
Wed, 2 Apr 2014 20:57:28 +0000 (13:57 -0700)
commitb405bfa49ec31f0c6d8636c4bdde17ee1f81deb7
tree53253d865a270b94ad88a33b96ec633d175a2759
parenta498c940bd630cb103d17ad8532a11122439411d
OSD: don't clear peering_wait_for_split in advance_map()

I really don't know why I added this...  Ops can be discarded from the
waiting_for_pg queue if we aren't primary simply because there must have
been an exchange of peering events before subops will be sent within a
particular epoch.  Thus, any events in the waiting_for_pg queue must be
client ops which should only be seen by the primary.  Peering events, on
the other hand, should only be discarded if we are in a new interval,
and that check might as well be performed in the peering wq.

Fixes: #6681
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 9ab513334c7ff9544bac07bd420c6d5d200cf535)
src/osd/OSD.cc