rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-15 01:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if walredo pipe was recreated by some other backend before klilling walredo process

Browse Source
This commit is contained in:
Konstantin Knizhnik
2023-10-12 22:53:27 +03:00
parent 21deb81acb
commit 3406676abd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pageserver/src/walredo.rs
View File

@@ -267,6 +267,7 @@ impl PostgresRedoManager {
let mut n_attempts = 0u32;
loop {
let mut proc = self.stdin.lock().unwrap();
let stdin_fd = proc.as_mut().unwrap().stdin.as_raw_fd();
let lock_time = Instant::now();
// launch the WAL redo process on first use
@@ -333,7 +334,9 @@ impl PostgresRedoManager {
// and hence the current `apply_wal_records()` calls will observe
// `output.stdout.as_raw_fd() != stdout_fd` .
if let Some(proc) = self.stdin.lock().unwrap().take() {
proc.child.kill_and_wait();
if stdin_fd == proc.stdin.as_raw_fd() {
proc.child.kill_and_wait();
}
}
} else if n_attempts != 0 {
info!(n_attempts, "retried walredo succeeded");