Fix XLogging of rotated key

dAdAbird · dAdAbird · commit 6e47930db8fb · 2025-08-26T17:02:40.000+03:00
Before this commit, we XLogged the provider ID (keyringId) of the old
key. Yet, we then attempt to fetch the new key from the old provider
during the Redo, which obviously fails and crashes the recovery.
So the next steps lead to the recovery stalemate:
- Create new provider (with new destination - mount_path, url etc).
- Create new server/global key.
- Rotate key.
- &lt;Crash!&gt;

This commit fixes it by Xlogging the new key's provider ID.

For: PG-1895
diff --git a/contrib/pg_tde/src/access/pg_tde_tdemap.c b/contrib/pg_tde/src/access/pg_tde_tdemap.c
@@ -318,8 +318,8 @@ pg_tde_perform_rotate_key(const TDEPrincipalKey *principal_key, const TDEPrincip
 	{
 		XLogPrincipalKeyRotate xlrec;
 
-		xlrec.databaseId = principal_key->keyInfo.databaseId;
-		xlrec.keyringId = principal_key->keyInfo.keyringId;
+		xlrec.databaseId = new_principal_key->keyInfo.databaseId;
+		xlrec.keyringId = new_principal_key->keyInfo.keyringId;
 		memcpy(xlrec.keyName, new_principal_key->keyInfo.name, sizeof(new_principal_key->keyInfo.name));
 
 		XLogBeginInsert();
diff --git a/contrib/pg_tde/src/access/pg_tde_xlog_keys.c b/contrib/pg_tde/src/access/pg_tde_xlog_keys.c
@@ -739,8 +739,8 @@ pg_tde_perform_rotate_server_key(const TDEPrincipalKey *principal_key,
 	{
 		XLogPrincipalKeyRotate xlrec;
 
-		xlrec.databaseId = principal_key->keyInfo.databaseId;
-		xlrec.keyringId = principal_key->keyInfo.keyringId;
+		xlrec.databaseId = new_principal_key->keyInfo.databaseId;
+		xlrec.keyringId = new_principal_key->keyInfo.keyringId;
 		memcpy(xlrec.keyName, new_principal_key->keyInfo.name, sizeof(new_principal_key->keyInfo.name));
 
 		XLogBeginInsert();

Original file line number	Diff line number	Diff line change
`@@ -318,8 +318,8 @@ pg_tde_perform_rotate_key(const TDEPrincipalKey *principal_key, const TDEPrincip`
`318`	`318`	`{`
`319`	`319`	`XLogPrincipalKeyRotate xlrec;`
`320`	`320`
`321`		`- xlrec.databaseId = principal_key->keyInfo.databaseId;`
`322`		`- xlrec.keyringId = principal_key->keyInfo.keyringId;`
	`321`	`+ xlrec.databaseId = new_principal_key->keyInfo.databaseId;`
	`322`	`+ xlrec.keyringId = new_principal_key->keyInfo.keyringId;`
`323`	`323`	`memcpy(xlrec.keyName, new_principal_key->keyInfo.name, sizeof(new_principal_key->keyInfo.name));`
`324`	`324`
`325`	`325`	`XLogBeginInsert();`
Original file line number	Diff line number	Diff line change
`@@ -739,8 +739,8 @@ pg_tde_perform_rotate_server_key(const TDEPrincipalKey *principal_key,`
`739`	`739`	`{`
`740`	`740`	`XLogPrincipalKeyRotate xlrec;`
`741`	`741`
`742`		`- xlrec.databaseId = principal_key->keyInfo.databaseId;`
`743`		`- xlrec.keyringId = principal_key->keyInfo.keyringId;`
	`742`	`+ xlrec.databaseId = new_principal_key->keyInfo.databaseId;`
	`743`	`+ xlrec.keyringId = new_principal_key->keyInfo.keyringId;`
`744`	`744`	`memcpy(xlrec.keyName, new_principal_key->keyInfo.name, sizeof(new_principal_key->keyInfo.name));`
`745`	`745`
`746`	`746`	`XLogBeginInsert();`