Skip to content

PG-1866 Reset wal cache on shmem init #542

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
merged 1 commit into from
Aug 19, 2025
Merged

PG-1866 Reset wal cache on shmem init #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions contrib/pg_tde/src/access/pg_tde_xlog_keys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,23 @@ get_wal_key_file_path(void)
return wal_key_file_path;
}

void
pg_tde_free_wal_key_cache(void)
{
WALKeyCacheRec *rec = tde_wal_key_cache;

while (rec != NULL)
{
WALKeyCacheRec *next = rec->next;

pfree(rec);
rec = next;
}

tde_wal_key_cache = NULL;
tde_wal_key_last_rec = NULL;
}

void
pg_tde_wal_last_key_set_location(WalLocation loc)
{
Expand Down
11 changes: 10 additions & 1 deletion contrib/pg_tde/src/access/pg_tde_xlog_smgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,18 @@ TDEXLogSmgrInit()
void
TDEXLogSmgrInitWrite(bool encrypt_xlog)
{
WalEncryptionKey *key = pg_tde_read_last_wal_key();
WalEncryptionKey *key;
WALKeyCacheRec *keys;

/*
* If the postmaster have done a "soft" restart after a backend crash, we
* may have inherited the cache in a weird state. Clearing the cache here
* ensures we reinitialize all keys from disk.
*/
pg_tde_free_wal_key_cache();

key = pg_tde_read_last_wal_key();

/*
* Always generate a new key on starting PostgreSQL to protect against
* attacks on CTR ciphers based on comparing the WAL generated by two
Expand Down
1 change: 1 addition & 0 deletions contrib/pg_tde/src/include/access/pg_tde_xlog_keys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ extern int pg_tde_count_wal_keys_in_file(void);
extern void pg_tde_create_wal_key(WalEncryptionKey *rel_key_data, WalEncryptionKeyType entry_type);
extern void pg_tde_delete_server_key(void);
extern WALKeyCacheRec *pg_tde_fetch_wal_keys(WalLocation start);
extern void pg_tde_free_wal_key_cache(void);
extern WALKeyCacheRec *pg_tde_get_last_wal_key(void);
extern TDESignedPrincipalKeyInfo *pg_tde_get_server_key_info(void);
extern WALKeyCacheRec *pg_tde_get_wal_cache_keys(void);
Expand Down