open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not try to fetch the last key when we do not have to

Browse Source 
This is likely a leftover from when the logic for unencrypted keys
was different from the one for real encryption keys.
pull/238/head
Andreas Karlsson 3 weeks ago committed by Andreas Karlsson
parent aed49c0847
commit 1338ceb137
1 changed files with 6 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      contrib/pg_tde/src/access/pg_tde_xlog_smgr.c

15
contrib/pg_tde/src/access/pg_tde_xlog_smgr.c
Unescape View File

@ -368,19 +368,16 @@ tdeheap_xlog_seg_write(int fd, const void *buf, size_t count, off_t offset,
lastKeyUsable = (writeKeyLoc.lsn != 0); lastKeyUsable = (writeKeyLoc.lsn != 0);
afterWriteKey = wal_location_cmp(writeKeyLoc, loc) <= 0; afterWriteKey = wal_location_cmp(writeKeyLoc, loc) <= 0;
if (EncryptionKey.type != WAL_KEY_TYPE_INVALID && !lastKeyUsable && afterWriteKey) if (EncryptionKey.type != WAL_KEY_TYPE_INVALID && !lastKeyUsable && afterWriteKey && !crashRecovery)
{ {
WALKeyCacheRec *last_key = pg_tde_get_last_wal_key(); WALKeyCacheRec *last_key = pg_tde_get_last_wal_key();
if (!crashRecovery) if (last_key == NULL || last_key->start.lsn < loc.lsn)
{ {
if (last_key == NULL || last_key->start.lsn < loc.lsn) pg_tde_wal_last_key_set_location(loc);
{ EncryptionKey.wal_start = loc;
pg_tde_wal_last_key_set_location(loc); TDEXLogSetEncKeyLocation(EncryptionKey.wal_start);
EncryptionKey.wal_start = loc; lastKeyUsable = true;
TDEXLogSetEncKeyLocation(EncryptionKey.wal_start);
lastKeyUsable = true;
}
} }
} }

Write Preview
Loading…
Cancel
Save