]> git-server-git.apps.pok.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)
committerSamuel Just <sam.just@inktank.com>
Mon, 4 Nov 2013 19:08:25 +0000 (11:08 -0800)
commit9ab513334c7ff9544bac07bd420c6d5d200cf535
treee82a6dcc8869787d95302355ecc52ef9cfd17e34
parent545135f3e1c75318940caa2c82ac32a53fc4f957
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>
src/osd/OSD.cc