Add -S, --slot option for backup with --stream

stalkerg · stalkerg · commit b0a63b679039 · 2016-10-25T20:21:27.000+03:00
diff --git a/backup.c b/backup.c
@@ -1508,11 +1508,13 @@ StreamLog(void *arg)
 	ctl.partial_suffix = NULL;
 	ctl.synchronous = false;
 	ctl.mark_done = false;
-	ReceiveXlogStream(conn, &ctl);
+	if(ReceiveXlogStream(conn, &ctl) == false)
+		elog(ERROR, "Problem in recivexlog");
 #else
-	ReceiveXlogStream(conn, startpos, starttli, NULL, basedir,
+	if(ReceiveXlogStream(conn, startpos, starttli, NULL, basedir,
 					  stop_streaming, standby_message_timeout, NULL,
-					  false, false);
+					  false, false) == false)
+		elog(ERROR, "Problem in recivexlog");
 #endif
 
 	PQfinish(conn);
diff --git a/expected/option.out b/expected/option.out
@@ -25,6 +25,7 @@ Backup options:
   --keep-data-generations=N keep GENERATION of full data backup
   --keep-data-days=DAY      keep enough data backup to recover to DAY days age
   --backup-pg-log           start backup pg_log directory
+  -S, --slot=SLOTNAME       replication slot to use
 
 Restore options:
   --recovery-target-time    time stamp up to which recovery will proceed
diff --git a/pg_arman.c b/pg_arman.c
@@ -66,6 +66,7 @@ static pgut_option options[] =
 	{ 'b', 10, "backup-pg-log",			&backup_logs },
 	{ 'f', 'b', "backup-mode",			opt_backup_mode,		SOURCE_ENV },
 	{ 'b', 'C', "smooth-checkpoint",	&smooth_checkpoint,		SOURCE_ENV },
+	{ 's', 'S', "slot",					&replication_slot,		SOURCE_ENV },
 	/* options with only long name (keep-xxx) */
 	{ 'i',  1, "keep-data-generations", &keep_data_generations, SOURCE_ENV },
 	{ 'i',  2, "keep-data-days",		&keep_data_days,		SOURCE_ENV },
@@ -242,6 +243,7 @@ pgut_help(bool details)
 	printf(_("  --keep-data-generations=N keep GENERATION of full data backup\n"));
 	printf(_("  --keep-data-days=DAY      keep enough data backup to recover to DAY days age\n"));
 	printf(_("  --backup-pg-log           start backup pg_log directory\n"));
+	printf(_("  -S, --slot=SLOTNAME       replication slot to use\n"));
 	printf(_("\nRestore options:\n"));
 	printf(_("  --recovery-target-time    time stamp up to which recovery will proceed\n"));
 	printf(_("  --recovery-target-xid     transaction ID up to which recovery will proceed\n"));
