Skip to content

Fix flaky ClickHouse test: add per-request timeout #1201

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

Closed
BilalG1 wants to merge 1 commit into from
Closed

Fix flaky ClickHouse test: add per-request timeout #1201

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 35 additions & 12 deletions apps/e2e/tests/backend/endpoints/api/v1/external-db-sync-basics.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,28 @@ async function waitForClickhouseUser(email: string, expectedDisplayName: string)

const timeoutMs = 180_000;
const intervalMs = 2_000;
const perRequestTimeoutMs = 30_000;
const start = performance.now();

let response;
while (performance.now() - start < timeoutMs) {
response = await runQueryForCurrentProject({
query: "SELECT primary_email, display_name FROM users WHERE primary_email = {email:String}",
params: {
email,
},
});
// Race against a per-request timeout so a single hanging fetch doesn't
// consume the entire test timeout (the outer while-loop timeout only
// checks at the top of the loop).
const maybeResponse = await Promise.race([
runQueryForCurrentProject({
query: "SELECT primary_email, display_name FROM users WHERE primary_email = {email:String}",
params: {
email,
},
}),
wait(perRequestTimeoutMs).then(() => null),
]);
if (!maybeResponse) {
await wait(intervalMs);
continue;
}
response = maybeResponse;
expect(response.status).toBe(200);
if (response.body.result.length === 1 && response.body.result[0].display_name === expectedDisplayName) {
return response;
Expand All @@ -54,16 +66,27 @@ async function waitForClickhouseUserDeletion(email: string) {

const timeoutMs = 180_000;
const intervalMs = 2_000;
const perRequestTimeoutMs = 30_000;
const start = performance.now();

let response;
while (performance.now() - start < timeoutMs) {
response = await runQueryForCurrentProject({
query: "SELECT primary_email FROM users WHERE primary_email = {email:String}",
params: {
email,
},
});
// Race against a per-request timeout so a single hanging fetch doesn't
// consume the entire test timeout.
const maybeResponse = await Promise.race([
runQueryForCurrentProject({
query: "SELECT primary_email FROM users WHERE primary_email = {email:String}",
params: {
email,
},
}),
wait(perRequestTimeoutMs).then(() => null),
]);
if (!maybeResponse) {
await wait(intervalMs);
continue;
}
response = maybeResponse;
expect(response).toMatchObject({
status: 200,
});
Expand Down
Loading