Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(pageserver): remove aux v1 keyspace if user fully switches to v2 #7824

Closed
wants to merge 2 commits into from
Closed

feat(pageserver): remove aux v1 keyspace if user fully switches to v2 #7824

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63db181
feat(pageserver): remove aux v1 keyspace if user fully switches to v2
skyzh May 21, 2024
496e96c
Update pageserver/src/tenant.rs
skyzh May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pageserver/src/pgdatadir_mapping.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,8 +873,12 @@ impl Timeline {

result.add_key(CONTROLFILE_KEY);
result.add_key(CHECKPOINT_KEY);
if self.get(AUX_FILES_KEY, lsn, ctx).await.is_ok() {
result.add_key(AUX_FILES_KEY);

// Remove v1 keyspace if the user has fully switched to v2.
if self.last_aux_file_policy.load() != Some(AuxFilePolicy::V2) {
if self.get(AUX_FILES_KEY, lsn, ctx).await.is_ok() {
result.add_key(AUX_FILES_KEY);
}
}

Ok((
Expand Down
6 changes: 5 additions & 1 deletion pageserver/src/tenant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3970,7 +3970,7 @@ mod tests {
use crate::DEFAULT_PG_VERSION;
use bytes::{Bytes, BytesMut};
use hex_literal::hex;
use pageserver_api::key::{AUX_KEY_PREFIX, NON_INHERITED_RANGE};
use pageserver_api::key::{AUX_FILES_KEY, AUX_KEY_PREFIX, NON_INHERITED_RANGE};
use pageserver_api::keyspace::KeySpace;
use pageserver_api::models::CompactionAlgorithm;
use rand::{thread_rng, Rng};
Expand Down Expand Up @@ -5995,6 +5995,10 @@ mod tests {
files.get("pg_logical/mappings/test3"),
Some(&bytes::Bytes::from_static(b"last"))
);

// Check if we are going to remove v1 aux files.
skyzh marked this conversation as resolved.
Show resolved Hide resolved
let (mut dense_keyspace, _) = tline.collect_keyspace(lsn, &ctx).await.unwrap();
assert!(dense_keyspace.remove_overlapping_with(&KeySpace::single(AUX_FILES_KEY..AUX_FILES_KEY.next())).is_empty());
}

#[tokio::test]
Expand Down
Loading