Commitaf0e674

committed

Add automatic detect of replica and remove same option.

1 parentf0703e5 commitaf0e674Copy full SHA for af0e674

File tree

+22

-6

lines changed

+22

-6

lines changed

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ static void get_lsn(PGconn conn, PGresult res, XLogRecPtr *lsn, bool stop_back`
`66`	`66`	`staticvoidget_xid(PGresultres,uint32xid);`
`67`	`67`	`staticvoidpg_ptrack_clear(void);`
`68`	`68`	`staticboolpg_ptrack_support(void);`
	`69`	`+staticboolpg_is_in_recovery(void);`
`69`	`70`	`staticchar*pg_ptrack_get_and_clear(Oidtablespace_oid,`
`70`	`71`	`Oiddb_oid,`
`71`	`72`	`Oidrel_oid,`
`@@ -115,6 +116,7 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)`
`115`	`116`	`pgBackup*prev_backup=NULL;`
`116`	`117`
`117`	`118`	`/* Block backup operations on a standby */`
	`119`	`+from_replica=pg_is_in_recovery();`
`118`	`120`	`if (pg_is_standby()&& !from_replica)`
`119`	`121`	`elog(ERROR,"Backup cannot run on a standby.");`
`120`	`122`
`@@ -653,9 +655,29 @@ pg_ptrack_support(void)`
`653`	`655`	`disconnect();`
`654`	`656`	`return false;`
`655`	`657`	`}`
	`658`	`+PQclear(res_db);`
	`659`	`+disconnect();`
`656`	`660`	`return true;`
`657`	`661`	`}`
`658`	`662`
	`663`	`+staticbool`
	`664`	`+pg_is_in_recovery(void)`
	`665`	`+{`
	`666`	`+PGresult*res_db;`
	`667`	`+reconnect();`
	`668`	`+res_db=execute("SELECT pg_is_in_recovery()",0,NULL);`
	`669`	`+`
	`670`	`+if (PQgetvalue(res_db,0,0)[0]=='t')`
	`671`	`+{`
	`672`	`+PQclear(res_db);`
	`673`	`+disconnect();`
	`674`	`+return true;`
	`675`	`+}`
	`676`	`+PQclear(res_db);`
	`677`	`+disconnect();`
	`678`	`+return false;`
	`679`	`+}`
	`680`	`+`
`659`	`681`	`staticvoid`
`660`	`682`	`pg_ptrack_clear(void)`
`661`	`683`	`{`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -246,9 +246,6 @@ absolute paths; relative paths are not allowed.`
`246`	`246`	`--stream:`
`247`	`247`	`Enable stream replication for save WAL during backup process.`
`248`	`248`
`249`		`---from-replica:`
`250`		`- Use non exclusive start backup for replica. Only for 9.6 and higher.`
`251`		`-`
`252`	`249`
`253`	`250`	`###RESTORE OPTIONS`
`254`	`251`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ Backup options:`
`26`	`26`	`--keep-data-generations=N keep GENERATION of full data backup`
`27`	`27`	`--keep-data-days=DAY keep enough data backup to recover to DAY days age`
`28`	`28`	`--backup-pg-log start backup pg_log directory`
`29`		`- --from-replica use non exclusive start backup for replica`
`30`	`29`
`31`	`30`	`Restore options:`
`32`	`31`	`--recovery-target-time time stamp up to which recovery will proceed`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ static pgut_option options[] =`
`67`	`67`	`{'b',10,"backup-pg-log",&backup_logs },`
`68`	`68`	`{'f','b',"backup-mode",opt_backup_mode,SOURCE_ENV },`
`69`	`69`	`{'b','C',"smooth-checkpoint",&smooth_checkpoint,SOURCE_ENV },`
`70`		`-{'b',12,"from-replica",&from_replica },`
`71`	`70`	`/* options with only long name (keep-xxx) */`
`72`	`71`	`{'i',1,"keep-data-generations",&keep_data_generations,SOURCE_ENV },`
`73`	`72`	`{'i',2,"keep-data-days",&keep_data_days,SOURCE_ENV },`
`@@ -247,7 +246,6 @@ pgut_help(bool details)`
`247`	`246`	`printf(_(" --keep-data-generations=N keep GENERATION of full data backup\n"));`
`248`	`247`	`printf(_(" --keep-data-days=DAY keep enough data backup to recover to DAY days age\n"));`
`249`	`248`	`printf(_(" --backup-pg-log start backup pg_log directory\n"));`
`250`		`-printf(_(" --from-replica use non exclusive start backup for replica\n"));`
`251`	`249`	`printf(_("\nRestore options:\n"));`
`252`	`250`	`printf(_(" --recovery-target-time time stamp up to which recovery will proceed\n"));`
`253`	`251`	`printf(_(" --recovery-target-xid transaction ID up to which recovery will proceed\n"));`

Comments

(0)