From a457256fef5819f288b3cf660b04f26d36587b36 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Mon, 9 Jan 2023 14:25:12 +0200 Subject: [PATCH] Fix log message matching (#3291) Spotted https://neon-github-public-dev.s3.amazonaws.com/reports/main/debug/3871991071/index.html#suites/158be07438eb5188d40b466b6acfaeb3/22966d740e33b677/ failing on `main`, fixes that by using a proper regex match string. Also removes one clippy lint suppression. --- pageserver/src/tenant/timeline.rs | 4 ++-- test_runner/fixtures/neon_fixtures.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs index 477108ec4c..0d8a5fc800 100644 --- a/pageserver/src/tenant/timeline.rs +++ b/pageserver/src/tenant/timeline.rs @@ -1710,8 +1710,8 @@ impl Timeline { continue 'outer; } - #[allow(unused_labels, clippy::never_loop)] // see comment at bottom of this loop - 'layer_map_search: loop { + #[allow(clippy::never_loop)] // see comment at bottom of this loop + '_layer_map_search: loop { let remote_layer = { let layers = timeline.layers.read().unwrap(); diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index bdd3dc004e..f284be8753 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -1923,7 +1923,7 @@ class NeonPageserver(PgProtocol): ".*kill_and_wait_impl.*: wait successful.*", ".*Replication stream finished: db error: ERROR: Socket IO error: end streaming to Some.*", ".*query handler for 'pagestream.*failed: Broken pipe.*", # pageserver notices compute shut down - ".*query handler for 'pagestream.*failed: Connection reset by peer (os error 104).*", # pageserver notices compute shut down + ".*query handler for 'pagestream.*failed: Connection reset by peer.*", # pageserver notices compute shut down # safekeeper connection can fail with this, in the window between timeline creation # and streaming start ".*Failed to process query for timeline .*: state uninitialized, no data to read.*",