From 137328f304051de789a6cfffc3175a309529917a Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Fri, 11 Jul 2025 14:01:55 +0000 Subject: [PATCH] initial set of fixups --- libs/neon_failpoint/src/macros.rs | 1 + pageserver/src/http/routes.rs | 2 +- safekeeper/src/http/routes.rs | 2 +- test_runner/fixtures/pageserver/http.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/neon_failpoint/src/macros.rs b/libs/neon_failpoint/src/macros.rs index 0a52be2cc4..cf218b23f0 100644 --- a/libs/neon_failpoint/src/macros.rs +++ b/libs/neon_failpoint/src/macros.rs @@ -303,6 +303,7 @@ macro_rules! pausable_failpoint { }}; ($name:literal, $cancel:expr) => {{ if cfg!(feature = "testing") { + ::tracing::info!("at failpoint {}", $name); // tests rely on this match $crate::failpoint_with_cancellation($name, None, $cancel) { $crate::either::Either::Left(result) => match result { $crate::FailpointResult::Continue => Ok(()), diff --git a/pageserver/src/http/routes.rs b/pageserver/src/http/routes.rs index 25e024dc30..186d651315 100644 --- a/pageserver/src/http/routes.rs +++ b/pageserver/src/http/routes.rs @@ -3976,7 +3976,7 @@ pub fn make_router( .get("/profile/cpu", |r| request_span(r, profile_cpu_handler)) .get("/profile/heap", |r| request_span(r, profile_heap_handler)) .get("/v1/status", |r| api_handler(r, status_handler)) - .put("/v1/failpoints", |r| { + .post("/v1/failpoints", |r| { testing_api_handler("manage failpoints", r, failpoints_handler) }) .post("/v1/reload_auth_validation_keys", |r| { diff --git a/safekeeper/src/http/routes.rs b/safekeeper/src/http/routes.rs index 4b061c65d9..a7593706ab 100644 --- a/safekeeper/src/http/routes.rs +++ b/safekeeper/src/http/routes.rs @@ -717,7 +717,7 @@ pub fn make_router( .get("/profile/cpu", |r| request_span(r, profile_cpu_handler)) .get("/profile/heap", |r| request_span(r, profile_heap_handler)) .get("/v1/status", |r| request_span(r, status_handler)) - .put("/v1/failpoints", |r| { + .post("/v1/failpoints", |r| { request_span(r, move |r| async { check_permission(&r, None)?; let cancel = CancellationToken::new(); diff --git a/test_runner/fixtures/pageserver/http.py b/test_runner/fixtures/pageserver/http.py index 46e196bc81..25cc834f4c 100644 --- a/test_runner/fixtures/pageserver/http.py +++ b/test_runner/fixtures/pageserver/http.py @@ -362,7 +362,7 @@ class PageserverHttpClient(requests.Session, MetricsGetter): else: raise ValueError(f"Invalid config format: {config}") - res = self.post(f"{self.base_url}/failpoints", json=body) + res = self.post(f"{self.base_url}/v1/failpoints", json=body) if res.status_code != 200: raise PageserverApiException( f"Failed to configure failpoints: {res.text}", res.status_code