lib/mvfst
1
0
Fork 0
mirror of https://github.com/facebookincubator/mvfst.git synced 2025-08-08 09:42:06 +03:00
Code Activity

Check that transport is still open in maybeStopWriteLooperAndArmSocketWritableEvent();

Browse Source 
Summary: We can throw in `writeSocketDataAndCatch()` and that would result in transport closure with drain (with drain keeping the socket alive), but the congestion controller would be reset in close: https://fburl.com/code/zxwfye5u and `maybeStopWriteLooperAndArmSocketWritableEvent()` trips over it later when executed in scope exit.

Reviewed By: mjoras

Differential Revision: D57728369

fbshipit-source-id: 51a4719ae97fab0e90e3ae093a3f56be5a096aff
This commit is contained in:
Konstantin Tsoy
2024-05-23 11:09:34 -07:00
committed by Facebook GitHub Bot
parent d612dc4526
commit c34e6eb1e0
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
quic/api/QuicTransportBase.cpp
View File

@@ -3584,7 +3584,7 @@ void QuicTransportBase::onSocketWritable() noexcept {
}
void QuicTransportBase::maybeStopWriteLooperAndArmSocketWritableEvent() {
if (!socket_) {
if (!socket_ || (closeState_ == CloseState::CLOSED)) {
return;
}
if (conn_->transportSettings.useSockWritableEvents &&
@@ -3595,9 +3595,14 @@ void QuicTransportBase::maybeStopWriteLooperAndArmSocketWritableEvent() {
bool haveBufferToRetry = writeReason == WriteDataReason::BUFFERED_WRITE;
bool haveNewDataToWrite =
(writeReason != WriteDataReason::NO_WRITE) && !haveBufferToRetry;
bool haveCongestionControlWindow = true;
if (conn_->congestionController) {
haveCongestionControlWindow =
conn_->congestionController->getWritableBytes() > 0;
}
bool haveFlowControlWindow = getSendConnFlowControlBytesAPI(*conn_) > 0;
bool connHasWriteWindow =
(conn_->congestionController->getWritableBytes() > 0) &&
(getSendConnFlowControlBytesAPI(*conn_) > 0);
haveCongestionControlWindow && haveFlowControlWindow;
if (haveBufferToRetry || (haveNewDataToWrite && connHasWriteWindow)) {
// Re-arm the write event and stop the write
// looper.

42
quic/api/test/QuicTransportBaseTest.cpp
View File

@@ -574,6 +574,14 @@ class TestQuicTransport
QuicTransportBase::maybeStopWriteLooperAndArmSocketWritableEvent();
}
void closeImpl(
folly::Optional<QuicError> error,
bool drainConnection = true,
bool sendCloseImmediately = true) {
QuicTransportBase::closeImpl(
std::move(error), drainConnection, sendCloseImmediately);
}
void onSocketWritable() noexcept override {
QuicTransportBase::onSocketWritable();
}
@@ -4906,5 +4914,39 @@ TEST_P(
transport.reset();
}
TEST_P(
QuicTransportImplTestBase,
TestMaybeStopWriteLooperAndArmSocketWritableEventOnClosedSocket) {
auto transportSettings = transport->getTransportSettings();
transportSettings.useSockWritableEvents = true;
transport->setTransportSettings(transportSettings);
transport->getConnectionState().streamManager->refreshTransportSettings(
transportSettings);
transport->transportConn->oneRttWriteCipher = test::createNoOpAead();
// Create a stream with outgoing data.
auto streamId = transport->createBidirectionalStream().value();
const auto& conn = transport->transportConn;
auto stream = transport->getStream(streamId);
stream->writeBuffer.append(IOBuf::copyBuffer("hello"));
// Insert streamId into the list.
conn->streamManager->addWritable(*stream);
conn->streamManager->updateWritableStreams(*stream);
// Write looper is running.
transport->writeLooper()->run(true /* thisIteration */);
EXPECT_TRUE(transport->writeLooper()->isRunning());
// Close the socket.
transport->closeImpl((QuicError(
QuicErrorCode(TransportErrorCode::INTERNAL_ERROR),
std::string("writeSocketDataAndCatch() error"))));
transport->maybeStopWriteLooperAndArmSocketWritableEvent();
transport.reset();
}
} // namespace test
} // namespace quic