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

Browse Source 
Signed-off-by: Alex Chi Z <chi@neon.tech>
This commit is contained in:
Alex Chi Z
2023-06-29 14:18:46 -04:00
parent dc9c842d21
commit e7955895d1
2 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pageserver/src/tenant/layer_map.rs
View File

@@ -247,28 +247,13 @@ impl LayerMap {
/// 'open' and 'frozen' layers!
///
pub fn search(&self, key: Key, end_lsn: Lsn) -> Option<SearchResult> {
self.search_incremental_inner(key, end_lsn).map(|(x, _)| x)
self.search_incremental(key, end_lsn).map(|(x, _)| x)
}
pub fn search_incremental(
&self,
key: Key,
end_lsn: Lsn,
force_incremental: bool,
) -> Option<(SearchResult, Option<SearchResult>)> {
self.search_incremental_inner(key, end_lsn).map(|(x, y)| {
if force_incremental {
(y.unwrap(), None)
} else {
(x, y)
}
})
}
pub fn search_incremental_inner(
&self,
key: Key,
end_lsn: Lsn,
) -> Option<(SearchResult, Option<SearchResult>)> {
let version = self.historic.get().unwrap().get_version(end_lsn.0 - 1)?;
let latest_delta = version.delta_coverage.query(key.to_i128());
@@ -300,7 +285,7 @@ impl LayerMap {
let img_lsn = image.get_lsn_range().start;
let image_is_newer = image.get_lsn_range().end >= delta.get_lsn_range().end;
let image_exact_match = img_lsn + 1 == end_lsn;
if image_is_newer {
if !image_exact_match && image_is_newer {
Some((
SearchResult {
layer: image,

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

@@ -2424,15 +2424,7 @@ impl Timeline {
let mut result = ValueReconstructResult::Continue;
let mut cont_lsn = Lsn(request_lsn.0 + 1);
let mut search_incremental = false;
'outer: loop {
let this_round_search_incremental = if search_incremental {
search_incremental = false;
true
} else {
false
};
// The function should have updated 'state'
//info!("CALLED for {} at {}: {:?} with {} records, cached {}", key, cont_lsn, result, reconstruct_state.records.len(), cached_lsn);
match result {
@@ -2555,7 +2547,6 @@ impl Timeline {
Ok(result) => result,
Err(e) => return Err(PageReconstructError::from(e)),
};
assert!(!this_round_search_incremental);
cont_lsn = lsn_floor;
// metrics: open_layer does not count as fs access, so we are not updating `read_count`
traversal_path.push((
@@ -2584,7 +2575,6 @@ impl Timeline {
Ok(result) => result,
Err(e) => return Err(PageReconstructError::from(e)),
};
assert!(!this_round_search_incremental);
cont_lsn = lsn_floor;
// metrics: open_layer does not count as fs access, so we are not updating `read_count`
traversal_path.push((
@@ -2600,7 +2590,7 @@ impl Timeline {
}
if let Some((SearchResult { lsn_floor, layer }, next)) =
layers.search_incremental(key, cont_lsn, this_round_search_incremental)
layers.search_incremental(key, cont_lsn)
{
let layer = timeline.lcache.get_from_desc(&layer);
// If it's a remote layer, download it and retry.
@@ -2628,8 +2618,20 @@ impl Timeline {
&& matches!(result, ValueReconstructResult::Continue)
{
// if is incremental image layer and not found, try again with delta layer
if next.is_some() {
search_incremental = true;
if let Some(SearchResult { lsn_floor, layer }) = next {
println!("TRIGGERED: image + delta same layer");
// HACK: no remote storage for now, safely get and downcast
let layer = timeline.lcache.get_from_desc(&layer);
cont_lsn = lsn_floor;
*read_count += 1;
traversal_path.push((
result,
cont_lsn,
Box::new({
let layer = Arc::clone(&layer);
move || layer.traversal_id()
}),
));
continue 'outer;
}
};