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

Fix catching error in test_replication_lag

Browse Source
This commit is contained in:
Konstantin Knizhnik
2024-02-01 16:31:43 +02:00
parent 28475c660f
commit 32f4a56327
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
safekeeper/src/send_wal.rs
View File

@@ -167,6 +167,10 @@ impl WalSenders {
fn record_standby_reply(self: &Arc<WalSenders>, id: WalSenderId, reply: &StandbyReply) {
let mut shared = self.mutex.lock();
let slot = shared.get_slot_mut(id);
info!(
"Record standby reply: ts={} apply_lsn={}",
reply.reply_ts, reply.apply_lsn
);
match &mut slot.feedback {
ReplicationFeedback::Standby(sf) => sf.reply = *reply,
ReplicationFeedback::Pageserver(_) => {

4
test_runner/regress/test_replication_lag.py
View File

@@ -50,9 +50,7 @@ def test_replication_lag(neon_simple_env: NeonEnv, pg_bin: PgBin):
)
except Exception as error:
print(f"Query failed: {error}")
if not str(error).startswith(
"canceling statement due to conflict with recovery"
):
if "canceling statement due to conflict with recovery" not in str(error):
raise
t.join()