Skip to content

PG-2381 Fix migration with empty files and entries #582

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

Merged
AndersAstrand merged 2 commits into from
May 19, 2026
Merged

PG-2381 Fix migration with empty files and entries #582

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4fa1ec
PG-2381 Do not try to migrate empty key files
AndersAstrand May 19, 2026
2c8d078
PG-2381 Ignore empty entries in key files when migrating
AndersAstrand May 19, 2026
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
16 changes: 14 additions & 2 deletions src/access/pg_tde_tdemap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,6 +972,13 @@ map_from_disk_entry_v3(int fd, off_t *entry_offset, const TDEPrincipalKey *princ
if (!read_one_map_entry_v3(fd, &disk_entry, entry_offset))
return false;

/* Decrypting empty entries would fail, so just return an empty entry. */
if (disk_entry.type == MAP_ENTRY_TYPE_EMPTY)
{
memset(out, 0, sizeof(TDEMapEntry));
return true;
}

ikey_from_map_entry_v3(&disk_entry, principal_key, &key);

rloc.spcOid = disk_entry.spcOid;
Expand Down Expand Up @@ -1030,8 +1037,11 @@ pg_tde_migrate_smgr_keys_file(void)
old_fd = pg_tde_open_file_basic(db_map_path, O_RDONLY | PG_BINARY, false);
pg_tde_file_header_read(db_map_path, old_fd, &fheader, &read_pos);

/* check if we have anything to do */
if (fheader.file_version == PG_TDE_SMGR_FILE_MAGIC)
/*
* Check if we have anything to do. read_pos == 0 means the file had
* no header because it was empty.
*/
if (read_pos == 0 || fheader.file_version == PG_TDE_SMGR_FILE_MAGIC)
{
CloseTransientFile(old_fd);
continue;
Expand Down Expand Up @@ -1060,6 +1070,8 @@ pg_tde_migrate_smgr_keys_file(void)

while (read_map_entry(old_fd, &read_pos, principal_key, &new_entry))
{
if (new_entry.type == MAP_ENTRY_TYPE_EMPTY)
continue;
pg_tde_write_one_map_entry(new_fd, &new_entry, &write_pos, db_map_path);
}

Expand Down
Loading