Make pg_rewind work with encrypted WAL

Author: dAdAbird

src/bin/pg_rewind/meson.build

@@ -19,11 +19,21 @@ if host_system == 'windows'
     '--FILEDESC', 'pg_rewind - synchronize a data directory with another one forked from'])
 endif
 
+link_w  = []
+include_dirs = [postgres_inc]
+
+if percona_ext == true
+  link_w = [pg_tde_frontend]
+  include_dirs = [postgres_inc, pg_tde_inc]
+endif
+
 pg_rewind = executable('pg_rewind',
   pg_rewind_sources,
   dependencies: [frontend_code, libpq, lz4, zstd],
   c_args: ['-DFRONTEND'], # needed for xlogreader et al
   kwargs: default_bin_args,
+  include_directories: include_dirs,
+  link_with: link_w,
 )
 bin_targets += pg_rewind
 

src/bin/pg_rewind/parsexlog.c

@@ -23,6 +23,10 @@
 #include "fe_utils/archive.h"
 #include "filemap.h"
 #include "pg_rewind.h"
+#ifdef PERCONA_EXT
+#include "access/pg_tde_xlog_smgr.h"
+#include "access/xlog_smgr.h"
+#endif
 
 /*
  * RmgrNames is an array of the built-in resource manager names, to make error
@@ -356,6 +360,11 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
 	 */
 	Assert(xlogreadfd != -1);
 
+#ifdef PERCONA_EXT
+	r = xlog_smgr->seg_read(xlogreadfd, readBuf, XLOG_BLCKSZ, (off_t) targetPageOff,
+							targetHistory[private->tliIndex].tli,
+							xlogreadsegno, WalSegSz);
+#else
 	/* Read the requested page */
 	if (lseek(xlogreadfd, (off_t) targetPageOff, SEEK_SET) < 0)
 	{
@@ -365,6 +374,7 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
 
 
 	r = read(xlogreadfd, readBuf, XLOG_BLCKSZ);
+#endif
 	if (r != XLOG_BLCKSZ)
 	{
 		if (r < 0)

src/bin/pg_rewind/pg_rewind.c

@@ -31,6 +31,12 @@
 #include "pg_rewind.h"
 #include "rewind_source.h"
 #include "storage/bufpage.h"
+#ifdef PERCONA_EXT
+#include "pg_tde.h"
+#include "access/pg_tde_fe_init.h"
+#include "access/pg_tde_xlog_smgr.h"
+#include "catalog/tde_global_space.h"
+#endif
 
 static void usage(const char *progname);
 
@@ -364,6 +370,15 @@ main(int argc, char **argv)
 	target_tli = Max(ControlFile_target.minRecoveryPointTLI,
 					 ControlFile_target.checkPointCopy.ThisTimeLineID);
 
+#ifdef PERCONA_EXT
+ 	{
+ 		/* TDOD: tde_path setup should be moved to the pg_tde side? */
+ 		char tde_path[MAXPGPATH];
+ 		snprintf(tde_path, sizeof(tde_path), "%s/%s", datadir_target, PG_TDE_DATA_DIR);
+ 		pg_tde_fe_init(tde_path);
+ 		TDEXLogSmgrInit();
+ 	}
+#endif
 	/*
 	 * Find the common ancestor timeline between the clusters.
 	 *