diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-04-08 15:43:53 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-04-08 17:02:45 -0700 |
| commit | d7b7acefc8e106f2563771a721944c57e10d54fb (patch) | |
| tree | 6cd8b43016aed56d57d1e31d835e7d914a8a4368 | |
| parent | 1a3890a59fd8504176fe987cd3b1401bf721aa3f (diff) | |
| download | ceph-d7b7acefc8e106f2563771a721944c57e10d54fb.tar.gz | |
Pipe: call discard_requeued_up_to under pipe_lock
Fixes: #4627
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/msg/Pipe.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc index ae94a6a340c..75f7e551292 100644 --- a/src/msg/Pipe.cc +++ b/src/msg/Pipe.cc @@ -311,6 +311,10 @@ int Pipe::accept() // http://ceph.newdream.net/wiki/Messaging_protocol int reply_tag = 0; uint64_t existing_seq = -1; + + // used for reading in the remote acked seq on connect + uint64_t newly_acked_seq = 0; + while (1) { if (tcp_read((char*)&connect, sizeof(connect)) < 0) { ldout(msgr->cct,10) << "accept couldn't read connect" << dendl; @@ -639,7 +643,6 @@ int Pipe::accept() } if (reply_tag == CEPH_MSGR_TAG_SEQ) { - uint64_t newly_acked_seq = 0; if(tcp_write((char*)&existing_seq, sizeof(existing_seq)) < 0) { ldout(msgr->cct,2) << "accept write error on in_seq" << dendl; goto fail_registered; @@ -648,10 +651,10 @@ int Pipe::accept() ldout(msgr->cct,2) << "accept read error on newly_acked_seq" << dendl; goto fail_registered; } - discard_requeued_up_to(newly_acked_seq); } pipe_lock.Lock(); + discard_requeued_up_to(newly_acked_seq); if (state != STATE_CLOSED) { ldout(msgr->cct,10) << "accept starting writer, state " << get_state_name() << dendl; start_writer(); |