Revert Serializing Outbound Transport Messages on IO Threads#64632
Merged
original-brownbear merged 3 commits intoelastic:masterfrom Nov 5, 2020
original-brownbear:revert-serialize-outbound-on-io-threads
Merged
Revert Serializing Outbound Transport Messages on IO Threads#64632original-brownbear merged 3 commits intoelastic:masterfrom original-brownbear:revert-serialize-outbound-on-io-threads
original-brownbear merged 3 commits intoelastic:masterfrom
original-brownbear:revert-serialize-outbound-on-io-threads
Conversation
Collaborator
|
Pinging @elastic/es-distributed (:Distributed/Network) |
DaveCTurner
requested changes
Nov 5, 2020
Member
DaveCTurner
left a comment
There was a problem hiding this comment.
I did the revert myself fairly naively and found just a couple of small differences, see below.
| @Override | ||
| public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) { | ||
| assert msg instanceof OutboundHandler.SendContext; | ||
| assert Transports.assertDefaultThreadContext(transport.getThreadPool().getThreadContext()); |
Member
There was a problem hiding this comment.
Think we can keep this assertion? It relates to #57792.
| private void internalSend(TcpChannel channel, SendContext sendContext) { | ||
| private void internalSend(TcpChannel channel, SendContext sendContext) throws IOException { | ||
| channel.getChannelStats().markAccessed(threadPool.relativeTimeInMillis()); | ||
| // stash thread context so that channel event loop is not polluted by thread context |
Member
There was a problem hiding this comment.
Think we can keep this comment? It relates to #57792.
Contributor
Author
|
Thanks for spotting those two, sorry for the oversight! |
Contributor
Author
|
Thanks David! |
This was referenced Nov 5, 2020
original-brownbear
added a commit
that referenced
this pull request
Nov 5, 2020
…#64653) Serializing outbound transport message on the IO loop was introduced in #56961. Unfortunately it turns out that this is incompatible with assumptions made by CCR code here: https://github.com/elastic/elasticsearch/blob/f22ddf822e24bb17f1772c3bacb7ee97a00339b8/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/GetCcrRestoreFileChunkAction.java#L60-L61 and that are not easy to work around on short notice. Raising reverting this move (as a temporary solution, it's still a valuable change long-term) as a blocker therefore as this seriously affects the stability of the initial phase of the CCR following by causing corrupted bytes to be send to the follower.
original-brownbear
added a commit
that referenced
this pull request
Nov 5, 2020
…#64654) Serializing outbound transport message on the IO loop was introduced in #56961. Unfortunately it turns out that this is incompatible with assumptions made by CCR code here: https://github.com/elastic/elasticsearch/blob/f22ddf822e24bb17f1772c3bacb7ee97a00339b8/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/GetCcrRestoreFileChunkAction.java#L60-L61 and that are not easy to work around on short notice. Raising reverting this move (as a temporary solution, it's still a valuable change long-term) as a blocker therefore as this seriously affects the stability of the initial phase of the CCR following by causing corrupted bytes to be send to the follower.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Serializing outbound transport message on the IO loop was introduced in #56961. Unfortunately it turns out that this is incompatible with assumptions made by CCR code here:
elasticsearch/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/GetCcrRestoreFileChunkAction.java
Lines 60 to 61 in f22ddf8
Raising reverting this move (as a temporary solution, it's still a valuable change long-term) as a blocker therefore as this seriously affects the stability of the initial phase of the CCR following by causing corrupted bytes to be send to the follower.