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

unify two identical failpoints in flush_frozen_layer

Browse Source 
probably is a merge artfact
This commit is contained in:
Dmitry Rodionov
2022-06-03 15:21:01 +03:00
committed by Dmitry Rodionov
parent 5a723d44cd
commit e442f5357b
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pageserver/src/layered_repository.rs
View File

@@ -1727,9 +1727,7 @@ impl LayeredTimeline {
new_delta_path.clone(),
self.conf.timeline_path(&self.timeline_id, &self.tenant_id),
])?;
fail_point!("checkpoint-before-sync");
fail_point!("flush-frozen");
fail_point!("flush-frozen-before-sync");
// Finally, replace the frozen in-memory layer with the new on-disk layer
{

2
test_runner/batch_others/test_ancestor_branch.py
View File

@@ -24,7 +24,7 @@ def test_ancestor_branch(neon_env_builder: NeonEnvBuilder):
'compaction_target_size': '4194304',
})
env.pageserver.safe_psql("failpoints flush-frozen=sleep(10000)")
env.pageserver.safe_psql("failpoints flush-frozen-before-sync=sleep(10000)")
pg_branch0 = env.postgres.create_start('main', tenant_id=tenant)
branch0_cur = pg_branch0.connect().cursor()

3
test_runner/batch_others/test_recovery.py
View File

@@ -45,7 +45,8 @@ def test_pageserver_recovery(neon_env_builder: NeonEnvBuilder):
# Configure failpoints
pscur.execute(
"failpoints checkpoint-before-sync=sleep(2000);checkpoint-after-sync=exit")
"failpoints flush-frozen-before-sync=sleep(2000);checkpoint-after-sync=exit"
)
# Do some updates until pageserver is crashed
try: