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

Jump to bottom

pageserver: respect has_relmap_file in collect_keyspace #8276

Merged
merged 2 commits into from
Jul 8, 2024
Merged

pageserver: respect has_relmap_file in collect_keyspace #8276

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d665bd
pageserver: respect has_relmap_file in collect_keyspace
jcsp Jul 5, 2024
9717551
Use list_dbdirs helper
jcsp Jul 8, 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
13 changes: 7 additions & 6 deletions pageserver/src/pgdatadir_mapping.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,13 +854,14 @@ impl Timeline {
result.add_key(DBDIR_KEY);

// Fetch list of database dirs and iterate them
let buf = self.get(DBDIR_KEY, lsn, ctx).await?;
let dbdir = DbDirectory::des(&buf)?;
let dbdir = self.list_dbdirs(lsn, ctx).await?;
let mut dbs: Vec<((Oid, Oid), bool)> = dbdir.into_iter().collect();

let mut dbs: Vec<(Oid, Oid)> = dbdir.dbdirs.keys().cloned().collect();
jcsp marked this conversation as resolved.
Show resolved Hide resolved
dbs.sort_unstable();
for (spcnode, dbnode) in dbs {
result.add_key(relmap_file_key(spcnode, dbnode));
dbs.sort_unstable_by(|(k_a, _), (k_b, _)| k_a.cmp(k_b));
for ((spcnode, dbnode), has_relmap_file) in dbs {
if has_relmap_file {
result.add_key(relmap_file_key(spcnode, dbnode));
}
result.add_key(rel_dir_to_key(spcnode, dbnode));

let mut rels: Vec<RelTag> = self
Expand Down
Loading