fix: incorrect /ready response on slow schema load

This commit is contained in:
steve-chavez
2024-03-15 11:03:01 -05:00
committed by Steve Chavez
parent 4b289b1c97
commit 11d8da046c
5 changed files with 38 additions and 5 deletions
+4 -4
View File
@@ -78,6 +78,7 @@ def run(
port=None,
host=None,
wait_for_readiness=True,
wait_max_seconds=1,
no_pool_connection_available=False,
no_startup_stdout=True,
):
@@ -118,7 +119,7 @@ def run(
process.stdin.close()
if wait_for_readiness:
wait_until_ready(adminurl + "/ready")
wait_until_ready(adminurl + "/ready", wait_max_seconds)
if no_startup_stdout:
process.stdout.read()
@@ -176,12 +177,11 @@ def wait_until_exit(postgrest):
raise PostgrestTimedOut()
def wait_until_ready(url):
def wait_until_ready(url, max_seconds):
"Wait for the given HTTP endpoint to return a status of 200."
session = requests_unixsocket.Session()
response = None
for _ in range(10):
for _ in range(max_seconds * 10):
try:
response = session.get(url, timeout=1)
if response.status_code == 200:
+20
View File
@@ -7,6 +7,26 @@ from util import *
from postgrest import *
def test_first_request_succeeds(defaultenv):
"the first request suceeds fast since the admin server readiness was checked before"
env = {
**defaultenv,
"PGRST_DB_SCHEMAS": "apflora",
"PGRST_DB_POOL": "2",
"PGRST_DB_ANON_ROLE": "postgrest_test_anonymous",
"PGRST_SERVER_TIMING_ENABLED": "true",
}
with run(env=env, wait_max_seconds=20) as postgrest:
response = postgrest.session.get("/tpopmassn?select=*,tpop(*)")
assert response.status_code == 200
server_timings = parse_server_timings_header(response.headers["Server-Timing"])
plan_dur = server_timings["plan"]
assert plan_dur < 2.0
def test_requests_wait_for_schema_cache_to_be_loaded(defaultenv):
"requests that use the schema cache (e.g. resource embedding) wait for schema cache to be loaded"