rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-18 05:30:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix log message matching (#3291)

Browse Source 
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.
This commit is contained in:
Kirill Bulatov
2023-01-09 14:25:12 +02:00
committed by GitHub
parent 3a22e1335d
commit a457256fef
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pageserver/src/tenant/timeline.rs
View File

@@ -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();

2
test_runner/fixtures/neon_fixtures.py
View File

@@ -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.*",