]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
msg/Pipe: fix seq handshake on reconnect 120/head
authorSage Weil <sage@inktank.com>
Thu, 21 Mar 2013 04:52:21 +0000 (21:52 -0700)
committerSage Weil <sage@inktank.com>
Thu, 21 Mar 2013 04:52:21 +0000 (21:52 -0700)
commit541cd3c64be0dfa04e8a2df39422e0eb9541a428
treef17ef4803e3c44504b89254f7b30abae0fa8a5da
parentb7e2a0d464d63ee00e3c39a1376fd7fc4894c938
msg/Pipe: fix seq handshake on reconnect

We go to the trouble to exchange our seq numbers during the handshake, but
the bit that then avoids resending old messages was broken because we
already requeue_sent() before we get to this point.  Fix it by discarding
queued items (in the high prio slot) that we don't need to resend, and
adjust out_seq as needed.

Drop the optional arg to requeue_sent() now that it is unused.

Signed-off-by: Sage Weil <sage@inktank.com>
src/msg/Pipe.cc
src/msg/Pipe.h