Remove get_min_recovery_point() and use get_redo() instead

Author: kulaginm

src/catchup.c

@@ -186,11 +186,16 @@ do_catchup_instance(const char *source_pgdata, const char *dest_pgdata, PGconn *
 		(backup_mode == BACKUP_MODE_DIFF_PTRACK ||
 		 backup_mode == BACKUP_MODE_DIFF_DELTA))
 	{
+		RedoParams	dest_redo;
+
 		dest_filelist = parray_new();
 		dir_list_file(dest_filelist, dest_pgdata,
 			true, true, false, backup_logs, true, 0, FIO_LOCAL_HOST);
 
-		sync_lsn = get_min_recovery_point(dest_pgdata);
+		// fill dest_redo.lsn and dest_redo.tli
+		get_redo(dest_pgdata, &dest_redo);
+
+		sync_lsn = dest_redo.lsn;
 		elog(INFO, "syncLSN = %X/%X", (uint32) (sync_lsn >> 32), (uint32) sync_lsn);
 	}
 

src/pg_probackup.h

@@ -1176,7 +1176,6 @@ extern uint32 get_data_checksum_version(bool safe);
 extern pg_crc32c get_pgcontrol_checksum(const char *pgdata_path);
 extern uint32 get_xlog_seg_size(const char *pgdata_path);
 extern void get_redo(const char *pgdata_path, RedoParams *redo);
-extern XLogRecPtr get_min_recovery_point(const char *pgdata_path);
 extern void set_min_recovery_point(pgFile *file, const char *backup_path,
 								   XLogRecPtr stop_backup_lsn);
 extern void copy_pgcontrol_file(const char *from_fullpath, fio_location from_location,

src/util.c

@@ -384,21 +384,6 @@ get_redo(const char *pgdata_path, RedoParams *redo)
 	redo->checksum_version = ControlFile.data_checksum_version;
 }
 
-/* Get minRecoveryPoint from control file from pgdata_path */
-XLogRecPtr
-get_min_recovery_point(const char *pgdata_path)
-{
-        ControlFileData ControlFile;
-        char       *buffer;
-        size_t          size;
-
-        buffer = slurpFile(pgdata_path, XLOG_CONTROL_FILE, &size, false, FIO_LOCAL_HOST);
-        digestControlFile(&ControlFile, buffer, size);
-        pg_free(buffer);
-
-        return ControlFile.minRecoveryPoint;
-}
-
 /*
  * Rewrite minRecoveryPoint of pg_control in backup directory. minRecoveryPoint
  * 'as-is' is not to be trusted.