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.

Sign up for GitHub

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

Jump to bottom

TESTS: Set SO_LINGER = 0 for MockNioTransport #32560

Merged
merged 7 commits into from
Sep 19, 2018
Merged

TESTS: Set SO_LINGER = 0 for MockNioTransport #32560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30584e9
TESTS: Set SO_LINGER = 0 for MockNioTransport
original-brownbear Aug 1, 2018
c00d926
check if channel is open before setting linger
original-brownbear Aug 1, 2018
e35755f
Merge remote-tracking branch 'elastic/master' into 32552
original-brownbear Aug 1, 2018
22dc798
Merge remote-tracking branch 'elastic/master' into 32552
original-brownbear Aug 2, 2018
b18a019
Merge remote-tracking branch 'elastic/master' into 32552
original-brownbear Sep 17, 2018
21c4e88
Merge remote-tracking branch 'elastic/master' into 32552
original-brownbear Sep 18, 2018
c8a85ee
CR: Turn off linger for mocktransport
original-brownbear Sep 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/framework/src/main/java/org/elasticsearch/transport/MockTcpTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ protected MockChannel initiateChannel(DiscoveryNode node, ActionListener<Void> c
executor.submit(() -> {
try {
socket.connect(address);
socket.setSoLinger(false, 0);
channel.loopRead(executor);
connectListener.onResponse(null);
} catch (Exception ex) {
Expand Down
1 change: 1 addition & 0 deletions test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ public MockSocketChannel createChannel(NioSelector selector, SocketChannel chann
BytesChannelContext context = new BytesChannelContext(nioChannel, selector, (e) -> exceptionCaught(nioChannel, e),
readWriteHandler, new InboundChannelBuffer(pageSupplier));
nioChannel.setContext(context);
nioChannel.setSoLinger(0);
return nioChannel;
}

Expand Down