Commit10e893a

committed

Merge branch 'PGPRO_pg_arman' into PGPRO9_5

2 parents68802e4 +e6214d8 commit10e893aCopy full SHA for 10e893a

File tree

-13

lines changed

-13

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)`
`77`	`77`	`if (pg_is_standby())`
`78`	`78`	`elog(ERROR,"Backup cannot run on a standby.");`
`79`	`79`
`80`		`-elog(INFO,"database backup start");`
	`80`	`+elog(LOG,"database backup start");`
`81`	`81`
`82`	`82`	`/* Initialize size summary */`
`83`	`83`	`current.data_bytes=0;`
`@@ -447,6 +447,12 @@ wait_for_archive(pgBackup backup, const char sql)`
`447`	`447`	`XLogSegNotargetSegNo;`
`448`	`448`
`449`	`449`	`reconnect();`
	`450`	`+`
	`451`	`+/* Remove annoying NOTICE messages generated by backend */`
	`452`	`+res=execute("SET client_min_messages = warning;",0,NULL);`
	`453`	`+PQclear(res);`
	`454`	`+`
	`455`	`+/* And execute the query wanted */`
`450`	`456`	`res=execute(sql,0,NULL);`
`451`	`457`
`452`	`458`	`/* Get LSN from execution result */`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,12 @@`
`1`	`1`	`\! bash sql/delete.sh`
`2`	`2`	`###### DELETE COMMAND TEST-0001 ######`
`3`	`3`	`###### delete full backups ######`
`4`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`5`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`6`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`7`	`4`	`try to delete the oldest backup`
`8`	`5`	`2`
`9`	`6`	`1`
`10`	`7`	`Number of deleted backups should be 1, is it so?: 1`
`11`	`8`	`###### DELETE COMMAND TEST-0002 ######`
`12`	`9`	`###### keep backups which are necessary for recovery ######`
`13`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`14`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`15`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`16`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`17`	`10`	`try to delete before third backup`
`18`	`11`	`3`
`19`	`12`	`1`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`\! bash sql/show.sh`
`2`	`2`	`###### SHOW COMMAND TEST-0001 ######`
`3`	`3`	`###### Status DONE and OK ######`
`4`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`5`	`4`	`0`
`6`	`5`	`OK: DONE status is shown properly.`
`7`	`6`	`0`
`@@ -10,22 +9,18 @@ OK: OK status is shown properly.`
`10`	`9`	`###### SHOW COMMAND TEST-0002 ######`
`11`	`10`	`###### Status RUNNING ######`
`12`	`11`	`OK: RUNNING status is shown properly.`
`13`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`14`	`12`
`15`	`13`	`###### SHOW COMMAND TEST-0003 ######`
`16`	`14`	`###### Status CORRUPT ######`
`17`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`18`	`15`	`0`
`19`	`16`	`remove a file from backup intentionally`
`20`	`17`	`0`
`21`	`18`	`OK: CORRUPT status is shown properly.`
`22`	`19`
`23`	`20`	`###### SHOW COMMAND TEST-0004 ######`
`24`	`21`	`###### Status DELETED ######`
`25`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`26`	`22`	`0`
`27`	`23`	`0`
`28`		`-NOTICE: pg_stop_backup complete, all required WAL segments have been archived`
`29`	`24`	`0`
`30`	`25`	`0`
`31`	`26`	`0`

Comments

(0)