qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QGrpcHttp2Channel: Fix deadline timeout start location 

We should start the deadline-timer when the actual call is beginning and
this is indicated when the initial headers have been sent and not the
stream that has been attached. As a drive-by mark the timer as
single-shot.

Pick-to: 6.10 6.9 6.8
Change-Id: I1eb58d143e4934a3c0770cd3ff24ed47972a5289
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Dennis Oberst 2025-07-17 15:53:05 +02:00
parent 8d58b8ba6a
commit cdc6938bbf
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/grpc/qgrpchttp2channel.cpp
View File

@ -417,8 +417,10 @@ Http2Handler::Http2Handler(const std::shared_ptr<QGrpcOperationContext> &operati
QObject::connect(channelOpPtr, &QGrpcOperationContext::writeMessageRequested, this, QObject::connect(channelOpPtr, &QGrpcOperationContext::writeMessageRequested, this,
&Http2Handler::writeMessage); &Http2Handler::writeMessage);
} }
QObject::connect(channelOpPtr, &QGrpcOperationContext::finished, &m_deadlineTimer, QObject::connect(channelOpPtr, &QGrpcOperationContext::finished, &m_deadlineTimer,
&QTimer::stop); &QTimer::stop);
m_deadlineTimer.setSingleShot(true);
writeMessage(channelOpPtr->argument()); writeMessage(channelOpPtr->argument());
} }
@ -517,16 +519,6 @@ void Http2Handler::attachStream(QHttp2Stream *stream_)
QObject::connect(m_stream.get(), &QHttp2Stream::uploadFinished, this, QObject::connect(m_stream.get(), &QHttp2Stream::uploadFinished, this,
&Http2Handler::processQueue); &Http2Handler::processQueue);
std::optional<std::chrono::milliseconds> deadline;
if (auto dt = channelOpPtr->callOptions().deadlineTimeout())
deadline = dt;
else if (auto chdt = channel()->channelOptions().deadlineTimeout())
deadline = chdt;
if (deadline) {
// We have an active stream and a deadline. It's time to start the timer.
QObject::connect(&m_deadlineTimer, &QTimer::timeout, this, &Http2Handler::deadlineTimeout);
m_deadlineTimer.start(*deadline);
}
} }
QGrpcOperationContext *Http2Handler::operation() const QGrpcOperationContext *Http2Handler::operation() const
@ -643,6 +635,16 @@ void Http2Handler::sendInitialRequest()
m_state = State::RequestHeadersSent; m_state = State::RequestHeadersSent;
m_initialHeaders.clear(); m_initialHeaders.clear();
processQueue(); processQueue();
std::optional<std::chrono::milliseconds> deadline = operation()->callOptions().deadlineTimeout();
if (!deadline)
deadline = channel()->channelOptions().deadlineTimeout();
if (deadline) {
// We have an active stream, a deadline and the initial headers have
// just been sent. It's time to start the timer.
connect(&m_deadlineTimer, &QTimer::timeout, this, &Http2Handler::deadlineTimeout);
m_deadlineTimer.start(*deadline);
}
} }
// The core logic for sending the already serialized data through the HTTP/2 stream. // The core logic for sending the already serialized data through the HTTP/2 stream.