-
Notifications
You must be signed in to change notification settings - Fork 25k
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
Transfer network bytes to smaller buffer #62673
Merged
Tim-Brooks
merged 10 commits into
elastic:master
from
Tim-Brooks:size_buffers_to_be_smaller
Sep 30, 2020
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
cad0b68
Transfer network bytes to smaller buffer
Tim-Brooks 4924f1d
Fiux
Tim-Brooks 135ebe0
Use estimated size
Tim-Brooks 73699e2
Checkstyle
Tim-Brooks 56f92e6
Merge remote-tracking branch 'upstream/master' into size_buffers_to_b…
Tim-Brooks 806e766
Variable names
Tim-Brooks 027cc63
Test
Tim-Brooks 62b9ef6
Merge remote-tracking branch 'upstream/master' into size_buffers_to_b…
Tim-Brooks c949ed9
Merge remote-tracking branch 'upstream/master' into size_buffers_to_b…
Tim-Brooks 6785615
Change
Tim-Brooks File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
43 changes: 43 additions & 0 deletions
43
modules/transport-netty4/src/main/java/org/elasticsearch/transport/NettyByteBufSizer.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.transport; | ||
|
||
import io.netty.buffer.ByteBuf; | ||
import io.netty.channel.ChannelHandler; | ||
import io.netty.channel.ChannelHandlerContext; | ||
import io.netty.handler.codec.MessageToMessageDecoder; | ||
|
||
import java.util.List; | ||
|
||
@ChannelHandler.Sharable | ||
public class NettyByteBufSizer extends MessageToMessageDecoder<ByteBuf> { | ||
|
||
@Override | ||
protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> out) { | ||
int readableBytes = buf.readableBytes(); | ||
if (buf.capacity() >= 1024) { | ||
ByteBuf resized = buf.discardReadBytes().capacity(readableBytes); | ||
assert resized.readableBytes() == readableBytes; | ||
out.add(resized.retain()); | ||
} else { | ||
out.add(buf.retain()); | ||
} | ||
} | ||
} |
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we really do this in general? It seems only makes sense for REST handlers that don't copy the buffers to unpooled anyway (search and bulk only as of right now). Maybe we should just copy those requests to new pooled buffers of appropriate size and leave the rest of them alone since we're releasing them on the io thread right away anyway?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed in the meeting, this is valuable as large messages can be aggregated for a period of time, hurting the memory ratios without this change.