Merge branch 'pgpro_1053_697'

Author: gsmolk

src/backup.c

@@ -811,6 +811,7 @@ do_backup(time_t start_time)
 	backup_conn = pgut_connect(pgut_dbname);
 	pgut_atexit_push(backup_disconnect, NULL);
 
+	current.primary_conninfo = pgut_get_conninfo_string(backup_conn);
 	/* Confirm data block size and xlog block size are compatible */
 	confirm_block_size("block_size", BLCKSZ);
 	confirm_block_size("wal_block_size", XLOG_BLCKSZ);

src/catalog.c

@@ -437,6 +437,10 @@ pgBackupWriteControl(FILE *out, pgBackup *backup)
 	/* 'parent_backup' is set if it is incremental backup */
 	if (backup->parent_backup != 0)
 		fprintf(out, "parent-backup-id = '%s'\n", base36enc(backup->parent_backup));
+
+	/* print connection info except password */
+	if (backup->primary_conninfo)
+		fprintf(out, "primary_conninfo = '%s'\n", backup->primary_conninfo);
 }
 
 /* create BACKUP_CONTROL_FILE */
@@ -498,6 +502,7 @@ readBackupControlFile(const char *path)
 		{'s', 0, "compress-alg",		&compress_alg, SOURCE_FILE_STRICT},
 		{'u', 0, "compress-level",		&compress_level, SOURCE_FILE_STRICT},
 		{'b', 0, "from-replica",		&from_replica, SOURCE_FILE_STRICT},
+		{'s', 0, "primary-conninfo",	&backup->primary_conninfo, SOURCE_FILE_STRICT},
 		{0}
 	};
 

src/help.c

@@ -117,6 +117,9 @@ help_pg_probackup(void)
 	printf(_("                 [-D pgdata-dir] [-i backup-id] [--progress]\n"));
 	printf(_("                 [--time=time|--xid=xid [--inclusive=boolean]]\n"));
 	printf(_("                 [--timeline=timeline] [-T OLDDIR=NEWDIR]\n"));
+	printf(_("                 [--immediate] [--recovery-target-name=target-name]\n"));
+	printf(_("                 [--recovery-target-action=pause|promote|shutdown]\n"));
+	printf(_("                 [--restore-as-replica]\n"));
 
 	printf(_("\n  %s validate -B backup-dir [--instance=instance_name]\n"), PROGRAM_NAME);
 	printf(_("                 [-i backup-id] [--progress]\n"));
@@ -259,7 +262,10 @@ help_restore(void)
 	printf(_("%s restore -B backup-dir --instance=instance_name\n"), PROGRAM_NAME);
 	printf(_("                 [-D pgdata-dir] [-i backup-id] [--progress]\n"));
 	printf(_("                 [--time=time|--xid=xid [--inclusive=boolean]]\n"));
-	printf(_("                 [--timeline=timeline] [-T OLDDIR=NEWDIR]\n\n"));
+	printf(_("                 [--timeline=timeline] [-T OLDDIR=NEWDIR]\n"));
+	printf(_("                 [--immediate] [--recovery-target-name=target-name]\n"));
+	printf(_("                 [--recovery-target-action=pause|promote|shutdown]\n"));
+	printf(_("                 [--restore-as-replica]\n\n"));
 
 	printf(_("  -B, --backup-path=backup-path    location of the backup storage area\n"));
 	printf(_("      --instance=instance_name     name of the instance\n"));
@@ -275,6 +281,16 @@ help_restore(void)
 	printf(_("  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"));
 	printf(_("                                   relocate the tablespace from directory OLDDIR to NEWDIR\n"));
 
+	printf(_("      --immediate                  end recovery as soon as a consistent state is reached\n"));
+	printf(_("      --recovery-target-name=target-name\n"));
+	printf(_("                                   the named restore point to which recovery will proceed\n"));
+	printf(_("      --recovery-target-action=pause|promote|shutdown\n"));
+	printf(_("                                   action the server should take once the recovery target is reached\n"));
+	printf(_("                                   (default: pause)\n"));
+
+	printf(_("  -R, --restore-as-replica         write a minimal recovery.conf in the output directory\n"));
+	printf(_("                                   to ease setting up a standby server\n"));
+
 	printf(_("\n  Logging options:\n"));
 	printf(_("      --log-level-console=log-level-console\n"));
 	printf(_("                                   level for console logging (default: info)\n"));

src/pg_probackup.c

@@ -62,6 +62,13 @@ static char		   *target_time;
 static char		   *target_xid;
 static char		   *target_inclusive;
 static TimeLineID	target_tli;
+static bool			target_immediate;
+static char		   *target_name = NULL;
+static char		   *target_action = NULL;;
+
+static pgRecoveryTarget *recovery_target_options = NULL;
+
+bool restore_as_replica = false;
 
 /* delete options */
 bool		delete_wal = false;
@@ -132,6 +139,10 @@ static pgut_option options[] =
 	{ 's', 22, "inclusive",				&target_inclusive,	SOURCE_CMDLINE },
 	{ 'u', 23, "timeline",				&target_tli,		SOURCE_CMDLINE },
 	{ 'f', 'T', "tablespace-mapping",	opt_tablespace_map,	SOURCE_CMDLINE },
+	{ 'b', 24, "immediate",				&target_immediate,	SOURCE_CMDLINE },
+	{ 's', 25, "recovery-target-name",	&target_name,		SOURCE_CMDLINE },
+	{ 's', 26, "recovery-target-action", &target_action,	SOURCE_CMDLINE },
+	{ 'b', 'R', "restore-as-replica",	&restore_as_replica,	SOURCE_CMDLINE },
 	/* delete options */
 	{ 'b', 130, "wal",					&delete_wal,		SOURCE_CMDLINE },
 	{ 'b', 131, "expired",				&delete_expired,	SOURCE_CMDLINE },
@@ -411,8 +422,13 @@ main(int argc, char *argv[])
 		pgdata_exclude_dir[i] = "pg_log";
 	}
 
-	if (target_time != NULL && target_xid != NULL)
-		elog(ERROR, "You can't specify recovery-target-time and recovery-target-xid at the same time");
+	if (backup_subcmd == VALIDATE || backup_subcmd == RESTORE)
+	{
+		/* parse all recovery target options into recovery_target_options structure */
+		recovery_target_options = parseRecoveryTargetOptions(target_time, target_xid,
+								   target_inclusive, target_tli, target_immediate,
+								   target_name, target_action);
+	}
 
 	if (num_threads < 1)
 		num_threads = 1;
@@ -448,16 +464,14 @@ main(int argc, char *argv[])
 			}
 		case RESTORE:
 			return do_restore_or_validate(current.backup_id,
-						  target_time, target_xid,
-						  target_inclusive, target_tli,
+						  recovery_target_options,
 						  true);
 		case VALIDATE:
 			if (current.backup_id == 0 && target_time == 0 && target_xid == 0)
 				return do_validate_all();
 			else
 				return do_restore_or_validate(current.backup_id,
-						  target_time, target_xid,
-						  target_inclusive, target_tli,
+						  recovery_target_options,
 						  false);
 		case SHOW:
 			return do_show(current.backup_id);

src/pg_probackup.h

@@ -226,16 +226,27 @@ typedef struct pgBackup
 	time_t			parent_backup; 	/* Identifier of the previous backup.
 									 * Which is basic backup for this
 									 * incremental backup. */
+	char			*primary_conninfo; /* Connection parameters of the backup
+										* in the format suitable for recovery.conf */
 } pgBackup;
 
 /* Recovery target for restore and validate subcommands */
 typedef struct pgRecoveryTarget
 {
 	bool			time_specified;
 	time_t			recovery_target_time;
+	/* add one more field in order to avoid deparsing recovery_target_time back */
+	const char		*target_time_string;
 	bool			xid_specified;
 	TransactionId	recovery_target_xid;
+	/* add one more field in order to avoid deparsing recovery_target_xid back */
+	const char		*target_xid_string;
+	TimeLineID		recovery_target_tli;
 	bool			recovery_target_inclusive;
+	bool			inclusive_specified;
+	bool			recovery_target_immediate;
+	const char		*recovery_target_name;
+	const char		*recovery_target_action;
 } pgRecoveryTarget;
 
 /* Union to ease operations on relation pages */
@@ -311,6 +322,9 @@ extern bool is_ptrack_support;
 extern bool is_checksum_enabled;
 extern bool exclusive_backup;
 
+/* restore options */
+extern bool restore_as_replica;
+
 /* delete options */
 extern bool		delete_wal;
 extern bool		delete_expired;
@@ -355,19 +369,16 @@ extern char *pg_ptrack_get_block(backup_files_args *arguments,
 								 size_t *result_size);
 /* in restore.c */
 extern int do_restore_or_validate(time_t target_backup_id,
-					  const char *target_time,
-					  const char *target_xid,
-					  const char *target_inclusive,
-					  TimeLineID target_tli,
+					  pgRecoveryTarget *rt,
 					  bool is_restore);
 extern bool satisfy_timeline(const parray *timelines, const pgBackup *backup);
 extern bool satisfy_recovery_target(const pgBackup *backup,
 									const pgRecoveryTarget *rt);
 extern parray * readTimeLineHistory_probackup(TimeLineID targetTLI);
 extern pgRecoveryTarget *parseRecoveryTargetOptions(
-	const char *target_time,
-	const char *target_xid,
-	const char *target_inclusive);
+	const char *target_time, const char *target_xid,
+	const char *target_inclusive, TimeLineID target_tli, bool target_immediate,
+	const char *target_name, const char *target_action);
 
 extern void opt_tablespace_map(pgut_option *opt, const char *arg);