fix(http): bound the WinHTTP response-header wait, and stop docs triggering builds
Build / macOS (macos-latest) (push) Successful in 50s
Build / Linux (ubuntu-24.04) (push) Successful in 1m14s
Build / macOS (macos-latest) (pull_request) Successful in 49s
Build / Linux (ubuntu-24.04) (pull_request) Successful in 1m16s
Build / Windows (windows-latest) (push) Failing after 3m55s
Build / Windows (windows-latest) (pull_request) Failing after 3m51s
Build / macOS (macos-latest) (push) Successful in 50s
Build / Linux (ubuntu-24.04) (push) Successful in 1m14s
Build / macOS (macos-latest) (pull_request) Successful in 49s
Build / Linux (ubuntu-24.04) (pull_request) Successful in 1m16s
Build / Windows (windows-latest) (push) Failing after 3m55s
Build / Windows (windows-latest) (pull_request) Failing after 3m51s
Two things, both prompted by an intermittent Windows CI failure in
test_api_client's testPlatformBackendTimeout: roughly 2 runs in 6, both its
assertions failed together, meaning a request with timeout_ms=700 waited out a
5s server stall and returned 200. Same failure on 2026-09-07 (job 5834) and
2026-09-09 (job 5911), on code that passed on other runs -- pre-existing and
intermittent, not caused by a change.
1. The real bug. `WinHttpSetTimeouts`' receive parameter maps to
WINHTTP_OPTION_RECEIVE_TIMEOUT, which Microsoft documents as a PER-PACKET
Winsock-layer read timeout ("applies to fetching each packet of data off
the socket"). The wait for the response HEADERS is a separate option,
WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, which WinHttpSetTimeouts does not
set and which defaults to 90 SECONDS. So a server that accepts, reads the
request and then stalls could block the calling thread for a minute and a
half no matter what the caller passed as timeout_ms -- precisely the
"blocking an OBS thread indefinitely" failure that test exists to prevent.
Now set explicitly, guarded by #ifdef so an older SDK still builds.
That is a genuine defect on its own merits. Whether it is the whole
explanation for the intermittency is NOT established: the same docs say
this timeout "is checked only when data is received from the socket", so
neither option guarantees a hard deadline -- that needs a watchdog calling
WinHttpCloseHandle, deliberately not done here.
2. Evidence, so the next run says more than pass/fail. The probe now runs 5
times and prints elapsed ms, ok, status, requests_seen and the backend's
error string (carrying GetLastError) for every attempt, so one CI run
yields a failure RATE and an error code. Each attempt gets a FRESH
loopback server: the server handles one connection at a time on a single
thread, so reusing it would leave attempts 2..n in the accept backlog --
never accepted, a different scenario from the one that fails. Verified on
Linux: 5/5 attempts give up at ~701ms.
Also: build.yml now has paths-ignore for **.md, LICENSE, NOTICE, and the two
release-only files. This is a full three-platform build behind a runner with
capacity:1, and six of them fired for one afternoon of documentation edits.
Nothing that feeds a build or a test is on that list. Tradeoff: a docs-only
push now shows no status at all rather than a green one.
The WinHTTP change cannot be compiled locally (Linux host); CI is its first
build. All 6 suites pass locally on Linux.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AzGnvQ6wfD7bw7PZN35ft9
This commit is contained in:
@@ -31,7 +31,29 @@ on:
|
|||||||
# job is ordinary commits.
|
# job is ordinary commits.
|
||||||
branches:
|
branches:
|
||||||
- "**"
|
- "**"
|
||||||
|
# Documentation-only changes cannot break a build, and this workflow is a
|
||||||
|
# full three-platform build (Windows included) behind a runner with
|
||||||
|
# capacity:1. Six of these fired for one afternoon of README/release-notes
|
||||||
|
# edits on 2026-09-09. Anything that feeds a build or a test is absent
|
||||||
|
# from this list on purpose -- release.yml and publish-release.sh only run
|
||||||
|
# on a `v*` tag, via release.yml's own trigger.
|
||||||
|
#
|
||||||
|
# Tradeoff: a docs-only push now shows NO status at all on the branch,
|
||||||
|
# rather than a green one. If a required-status check is ever added, these
|
||||||
|
# paths have to be reconsidered.
|
||||||
|
paths-ignore:
|
||||||
|
- "**.md"
|
||||||
|
- "LICENSE"
|
||||||
|
- "NOTICE"
|
||||||
|
- ".gitea/workflows/release.yml"
|
||||||
|
- ".gitea/scripts/publish-release.sh"
|
||||||
pull_request:
|
pull_request:
|
||||||
|
paths-ignore:
|
||||||
|
- "**.md"
|
||||||
|
- "LICENSE"
|
||||||
|
- "NOTICE"
|
||||||
|
- ".gitea/workflows/release.yml"
|
||||||
|
- ".gitea/scripts/publish-release.sh"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
linux:
|
linux:
|
||||||
|
|||||||
@@ -116,6 +116,39 @@ public:
|
|||||||
WinHttpSetTimeouts(session.get(), static_cast<int>(timeout), static_cast<int>(timeout),
|
WinHttpSetTimeouts(session.get(), static_cast<int>(timeout), static_cast<int>(timeout),
|
||||||
static_cast<int>(timeout), static_cast<int>(timeout));
|
static_cast<int>(timeout), static_cast<int>(timeout));
|
||||||
|
|
||||||
|
// WinHttpSetTimeouts' receive parameter maps to
|
||||||
|
// WINHTTP_OPTION_RECEIVE_TIMEOUT, which Microsoft documents as a
|
||||||
|
// PER-PACKET Winsock-layer read timeout ("applies to fetching each
|
||||||
|
// packet of data off the socket"), not a deadline on the response.
|
||||||
|
// The wait for the response HEADERS is a *separate* option,
|
||||||
|
// WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT ("to wait to receive all
|
||||||
|
// response headers to a request"), which WinHttpSetTimeouts does not
|
||||||
|
// touch and which defaults to 90 SECONDS. Without this call a server
|
||||||
|
// that accepts, reads the request and then stalls can hold this
|
||||||
|
// thread for a minute and a half regardless of request.timeout_ms --
|
||||||
|
// exactly the "blocking an OBS thread indefinitely" failure
|
||||||
|
// testPlatformBackendTimeout exists to prevent, and the likely
|
||||||
|
// mechanism behind that test's intermittent Windows failures.
|
||||||
|
//
|
||||||
|
// Caveat, also documented: this timeout "is checked only when data is
|
||||||
|
// received from the socket", so it bounds the wait but does not
|
||||||
|
// guarantee a hard deadline. A guaranteed deadline needs a watchdog
|
||||||
|
// thread calling WinHttpCloseHandle; not done here.
|
||||||
|
//
|
||||||
|
// Guarded because the constant postdates some Windows SDK headers; a
|
||||||
|
// toolchain without it keeps the previous (90s default) behaviour
|
||||||
|
// rather than failing to build.
|
||||||
|
#ifdef WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT
|
||||||
|
DWORD response_timeout = timeout;
|
||||||
|
// Return value deliberately unchecked: a rejected option leaves the
|
||||||
|
// documented default in place, which is degraded but still correct
|
||||||
|
// behaviour, and there is no logging sink in this layer to report it
|
||||||
|
// to. The timeout probe in test_api_client.cpp is what would catch a
|
||||||
|
// regression here.
|
||||||
|
WinHttpSetOption(session.get(), WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &response_timeout,
|
||||||
|
sizeof(response_timeout));
|
||||||
|
#endif
|
||||||
|
|
||||||
Handle connect(WinHttpConnect(session.get(), host, parts.nPort, 0));
|
Handle connect(WinHttpConnect(session.get(), host, parts.nPort, 0));
|
||||||
if (!connect) {
|
if (!connect) {
|
||||||
response.network_error = lastErrorMessage("WinHttpConnect");
|
response.network_error = lastErrorMessage("WinHttpConnect");
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ You may obtain a copy of the License at
|
|||||||
// three runners rather than assumed to work.
|
// three runners rather than assumed to work.
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <cstdio>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
@@ -422,22 +423,67 @@ void testPlatformBackendTimeout()
|
|||||||
{
|
{
|
||||||
// A server that accepts and then stalls. The plugin must give up on its
|
// A server that accepts and then stalls. The plugin must give up on its
|
||||||
// own timeout rather than blocking an OBS thread indefinitely.
|
// own timeout rather than blocking an OBS thread indefinitely.
|
||||||
sttest::LoopbackServer server([](const std::string &) {
|
//
|
||||||
std::this_thread::sleep_for(std::chrono::seconds(5));
|
// INSTRUMENTED (2026-09-09) while chasing an intermittent Windows-only
|
||||||
return sttest::httpResponse(200, "OK", R"({"slots":[]})");
|
// failure: on roughly 2 of 6 CI runs both assertions below fail together,
|
||||||
});
|
// meaning the request waited out the full 5s stall and returned 200 --
|
||||||
ST_ASSERT(server.valid());
|
// the timeout did not fire at all. Same failure seen on 2026-09-07
|
||||||
|
// (job 5834) and 2026-09-09 (job 5911), on identical code that passed on
|
||||||
|
// other runs, so it is not a code change that caused it.
|
||||||
|
//
|
||||||
|
// The probe runs kProbes times and prints one line per attempt so a
|
||||||
|
// single CI run yields a failure RATE and the WinHTTP error code, rather
|
||||||
|
// than one bit. `ST_ASSERT` records and continues, so every attempt is
|
||||||
|
// reported even when one fails. Remove the loop and this comment once the
|
||||||
|
// mechanism is understood and fixed.
|
||||||
|
constexpr int kProbes = 5;
|
||||||
|
constexpr long long kStallMs = 5000;
|
||||||
|
constexpr long kTimeoutMs = 700;
|
||||||
|
|
||||||
std::shared_ptr<HttpClient> http(createPlatformHttpClient());
|
int timed_out = 0;
|
||||||
HttpRequest request;
|
for (int i = 0; i < kProbes; ++i) {
|
||||||
request.url = server.baseUrl() + "/api/obs/main-room/slots?key=k";
|
// A FRESH server per attempt, deliberately. `LoopbackServer` accepts
|
||||||
request.timeout_ms = 700;
|
// and handles one connection at a time on a single thread, so reusing
|
||||||
|
// one server across attempts would leave attempts 2..n sitting in the
|
||||||
|
// accept backlog -- a different scenario (never accepted) from the one
|
||||||
|
// that fails on Windows (accepted, request read, then stalled).
|
||||||
|
sttest::LoopbackServer server([kStallMs](const std::string &) {
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(kStallMs));
|
||||||
|
return sttest::httpResponse(200, "OK", R"({"slots":[]})");
|
||||||
|
});
|
||||||
|
ST_ASSERT(server.valid());
|
||||||
|
|
||||||
const auto start = std::chrono::steady_clock::now();
|
std::shared_ptr<HttpClient> http(createPlatformHttpClient());
|
||||||
const HttpResponse response = http->send(request);
|
HttpRequest request;
|
||||||
const auto elapsed = std::chrono::steady_clock::now() - start;
|
request.url = server.baseUrl() + "/api/obs/main-room/slots?key=k";
|
||||||
ST_ASSERT(!response.ok());
|
request.timeout_ms = kTimeoutMs;
|
||||||
ST_ASSERT(std::chrono::duration_cast<std::chrono::milliseconds>(elapsed).count() < 4000);
|
|
||||||
|
const auto start = std::chrono::steady_clock::now();
|
||||||
|
const HttpResponse response = http->send(request);
|
||||||
|
const auto elapsed = std::chrono::steady_clock::now() - start;
|
||||||
|
const long long ms = std::chrono::duration_cast<std::chrono::milliseconds>(elapsed).count();
|
||||||
|
|
||||||
|
const bool gave_up = !response.ok() && ms < 4000;
|
||||||
|
if (gave_up)
|
||||||
|
++timed_out;
|
||||||
|
|
||||||
|
// Always printed, pass or fail: elapsed time and the backend's own
|
||||||
|
// error string (which carries GetLastError on Windows) are the
|
||||||
|
// evidence. requests_seen separates "the client never reached the
|
||||||
|
// server" (0) from "the server read the request and the client then
|
||||||
|
// waited it out" (1).
|
||||||
|
std::fprintf(stderr,
|
||||||
|
" [timeout-probe %d/%d] elapsed=%lldms ok=%d status=%ld "
|
||||||
|
"requests_seen=%d network_error='%s' -> %s\n",
|
||||||
|
i + 1, kProbes, ms, response.ok() ? 1 : 0, response.status,
|
||||||
|
server.requestCount(), response.network_error.c_str(),
|
||||||
|
gave_up ? "gave up (expected)" : "WAITED OUT THE STALL");
|
||||||
|
|
||||||
|
ST_ASSERT(!response.ok());
|
||||||
|
ST_ASSERT(ms < 4000);
|
||||||
|
}
|
||||||
|
std::fprintf(stderr, " [timeout-probe] %d/%d attempts honoured the %ldms timeout\n",
|
||||||
|
timed_out, kProbes, kTimeoutMs);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
Reference in New Issue
Block a user