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

handle name conflict

Browse Source 
Signed-off-by: Alex Chi Z <chi@neon.tech>
This commit is contained in:
Alex Chi Z
2023-07-05 16:26:02 -04:00
parent a079d250d9
commit 7e7cdaa3eb
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4465,9 +4465,18 @@ impl Timeline {
}
}
let new_layers_key = new_layers
.iter()
.map(|x| x.layer_desc().key())
.collect::<HashSet<_>>();
for layer in layers_to_delete {
layer_names_to_delete.push(layer.filename());
self.delete_historic_layer_new(layer_removal_cs.clone(), layer, &mut updates)?;
if !new_layers_key.contains(&layer.key()) {
layer_names_to_delete.push(layer.filename());
self.delete_historic_layer_new(layer_removal_cs.clone(), layer, &mut updates)?;
} else {
updates.remove_historic_new((*layer).clone());
}
}
let new_tier_at_index = new_tier_at_index.unwrap();