Add Xlog init macros for frontend

percona · Sep 4, 2024 · 9828734 · 9828734
1 parent 051be41
commit 9828734
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 deletions.
diff --git a/src/catalog/tde_global_space.c b/src/catalog/tde_global_space.c
@@ -63,9 +63,10 @@ TDEInitGlobalKeys(const char *dir)
 #endif							/* !FRONTEND */
 	{
 		RelKeyData *ikey;
-		
+
 		if (dir != NULL)
 			pg_tde_set_globalspace_dir(dir);
+
 		ikey = pg_tde_get_key_from_file(&GLOBAL_SPACE_RLOCATOR(XLOG_TDE_OID));
 
 		/*

diff --git a/src/include/access/pg_tde_tdemap.h b/src/include/access/pg_tde_tdemap.h
@@ -12,7 +12,6 @@
 #include "access/xlog_internal.h"
 #include "catalog/pg_tablespace_d.h"
 #include "catalog/tde_principal_key.h"
-#include "storage/fd.h"
 #include "storage/relfilelocator.h"
 
 typedef struct InternalKey

diff --git a/src/include/access/pg_tde_xlog_encrypt_fe.h b/src/include/access/pg_tde_xlog_encrypt_fe.h
@@ -0,0 +1,29 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_tde_xlog_encrypt_fe.h
+ *	   Frontened definitions for encrypted XLog storage manager
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef PG_TDE_XLOGENCRYPT_FE_H
+#define PG_TDE_XLOGENCRYPT_FE_H
+
+#ifdef PERCONA_FORK
+#include "access/pg_tde_xlog_encrypt.h"
+#include "catalog/tde_global_space.h"
+#include "encryption/enc_aes.h"
+#include "keyring/keyring_file.h"
+#include "keyring/keyring_vault.h"
+
+/* Frontend has to call it needs to read an encrypted XLog */
+#define TDE_XLOG_INIT(kring_dir)	\
+	AesInit();						\
+	InstallFileKeyring();			\
+	InstallVaultV2Keyring();		\
+	TDEInitGlobalKeys(kring_dir);	\
+	TDEXLogSmgrInit()
+
+#endif							/* PERCONA_FORK */
+
+#endif							/* PG_TDE_XLOGENCRYPT_FE_H */
diff --git a/src/include/catalog/tde_global_space.h b/src/include/catalog/tde_global_space.h
@@ -21,6 +21,7 @@
  * We take Oids of the sql operators, so there is no overlap with the "real"
  * catalog objects possible.
  */
+#define GLOBAL_DATA_TDE_OID	InvalidOid
 #define XLOG_TDE_OID        608
 
 #define GLOBAL_DATA_TDE_OID	InvalidOid

diff --git a/src/include/pg_tde_fe.h b/src/include/pg_tde_fe.h
@@ -21,8 +21,9 @@
 #pragma GCC diagnostic ignored "-Wunused-value"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wextra"
+
 /*
- * Errors handeling
+ * Errors handling
  * ----------------------------------------
  */