Skip to content

tcp: fix socket read data with rst flake #29616

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

Merged
yanavlasov merged 2 commits into from
Sep 14, 2023
Merged

tcp: fix socket read data with rst flake #29616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cb4e60
fix a data with rst case
botengyao Sep 14, 2023
e105063
clean up
botengyao Sep 14, 2023
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
3 changes: 3 additions & 0 deletions source/common/network/connection_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,9 @@ void ConnectionImpl::onReadReady() {
if (enable_rst_detect_send_ && result.err_code_.has_value() &&
result.err_code_ == Api::IoError::IoErrorCode::ConnectionReset) {
ENVOY_CONN_LOG(trace, "read: rst close from peer", *this);
if (result.bytes_processed_ != 0) {
onRead(new_buffer_size);
}
setDetectedCloseType(DetectedCloseType::RemoteReset);
closeSocket(ConnectionEvent::RemoteClose);
return;
Expand Down
39 changes: 39 additions & 0 deletions test/common/network/connection_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2794,6 +2794,45 @@ TEST_F(MockTransportConnectionImplTest, ResumeWhileAndAfterReadDisable) {
connection_->readDisable(false));
}

// Test the connection correctly handle the transport socket read (data + RST) case.
TEST_F(MockTransportConnectionImplTest, ServerLargeReadResetClose) {
InSequence s;

std::shared_ptr<MockReadFilter> read_filter(new StrictMock<MockReadFilter>());
connection_->addReadFilter(read_filter);

EXPECT_CALL(*transport_socket_, doRead(_))
.WillOnce(Invoke([](Buffer::Instance& buffer) -> IoResult {
buffer.add("01234");
return {PostIoAction::KeepOpen, 5, false};
}));

EXPECT_CALL(*read_filter, onNewConnection()).WillOnce(Return(FilterStatus::Continue));
EXPECT_CALL(*read_filter, onData(_, _))
.WillOnce(Invoke([&](Buffer::Instance& data, bool) -> FilterStatus {
EXPECT_EQ(5, data.length());
data.drain(data.length());
return FilterStatus::Continue;
}));
file_ready_cb_(Event::FileReadyType::Read);

// This simulates the socket do {...} while read when there is processed data
// with the last rest flag.
EXPECT_CALL(*transport_socket_, doRead(_))
.WillOnce(Invoke([](Buffer::Instance& buffer) -> IoResult {
buffer.add("5678");
return {PostIoAction::Close, 4, false, Api::IoError::IoErrorCode::ConnectionReset};
}));

EXPECT_CALL(*read_filter, onData(_, _))
.WillOnce(Invoke([&](Buffer::Instance& data, bool) -> FilterStatus {
EXPECT_EQ(4, data.length());
data.drain(data.length());
return FilterStatus::Continue;
}));
file_ready_cb_(Event::FileReadyType::Read);
}

// Test that BytesSentCb is invoked at the correct times
TEST_F(MockTransportConnectionImplTest, BytesSentCallback) {
uint64_t bytes_sent = 0;
Expand Down