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

Traverse frozen layer in get_reconstruct_data in reverse order (#1601)

Browse Source 
* Traverse frozen layer in get_reconstruct_data in reverse order

* Fix comments on frozen layers.

Note explicitly the order that the layers are in the queue.

* Add fail point to reproduce failpoint iteration error

Co-authored-by: Heikki Linnakangas <heikki@neon.tech>
This commit is contained in:
Konstantin Knizhnik
2022-05-03 08:07:14 +03:00
committed by GitHub
parent 87a6c4d051
commit baa59512b8
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pageserver/src/layered_repository.rs
View File

@@ -1432,7 +1432,8 @@ impl LayeredTimeline {
let layers = timeline.layers.read().unwrap();
// Check the open and frozen in-memory layers first
// Check the open and frozen in-memory layers first, in order from newest
// to oldest.
if let Some(open_layer) = &layers.open_layer {
let start_lsn = open_layer.get_lsn_range().start;
if cont_lsn > start_lsn {
@@ -1450,7 +1451,7 @@ impl LayeredTimeline {
continue;
}
}
for frozen_layer in layers.frozen_layers.iter() {
for frozen_layer in layers.frozen_layers.iter().rev() {
let start_lsn = frozen_layer.get_lsn_range().start;
if cont_lsn > start_lsn {
//info!("CHECKING for {} at {} on frozen layer {}", key, cont_lsn, frozen_layer.filename().display());
@@ -1695,7 +1696,9 @@ impl LayeredTimeline {
self.conf.timeline_path(&self.timelineid, &self.tenantid),
])?;
// Finally, replace the frozen in-memory layer with the new on-disk layers
fail_point!("flush-frozen");
// Finally, replace the frozen in-memory layer with the new on-disk layer
{
let mut layers = self.layers.write().unwrap();
let l = layers.frozen_layers.pop_front();

11
pageserver/src/layered_repository/layer_map.rs
View File

@@ -43,10 +43,13 @@ pub struct LayerMap {
pub next_open_layer_at: Option<Lsn>,
///
/// The frozen layer, if any, contains WAL older than the current 'open_layer'
/// or 'next_open_layer_at', but newer than any historic layer. The frozen
/// layer is during checkpointing, when an InMemoryLayer is being written out
/// to disk.
/// Frozen layers, if any. Frozen layers are in-memory layers that
/// are no longer added to, but haven't been written out to disk
/// yet. They contain WAL older than the current 'open_layer' or
/// 'next_open_layer_at', but newer than any historic layer.
/// The frozen layers are in order from oldest to newest, so that
/// the newest one is in the 'back' of the VecDeque, and the oldest
/// in the 'front'.
///
pub frozen_layers: VecDeque<Arc<InMemoryLayer>>,

4
test_runner/batch_others/test_ancestor_branch.py
View File

@@ -33,6 +33,10 @@ def test_ancestor_branch(zenith_env_builder: ZenithEnvBuilder):
'compaction_target_size': '4194304',
})
with closing(env.pageserver.connect()) as psconn:
with psconn.cursor(cursor_factory=psycopg2.extras.DictCursor) as pscur:
pscur.execute("failpoints flush-frozen=sleep(10000)")
env.zenith_cli.create_timeline(f'main', tenant_id=tenant)
pg_branch0 = env.postgres.create_start('main', tenant_id=tenant)
branch0_cur = pg_branch0.connect().cursor()