Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

msg/Pipe: discard delay queue before incoming queue #4029

Merged
merged 1 commit into from Mar 17, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/msg/Pipe.cc
Expand Up @@ -1337,9 +1337,9 @@ void Pipe::fault(bool onread)
unregister_pipe();
msgr->lock.Unlock();

in_q->discard_queue(conn_id);
if (delay_thread)
delay_thread->discard();
in_q->discard_queue(conn_id);
discard_out_queue();

// disconnect from Connection, and mark it failed. future messages
Expand Down