Merge branch 'PGPRO_pg_arman' into PGPRO9_5

vbwagner · vbwagner · commit 10e893a4c608 · 2016-03-28T13:56:06.000+03:00
diff --git a/contrib/pg_arman/backup.c b/contrib/pg_arman/backup.c
@@ -77,7 +77,7 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)
 	if (pg_is_standby())
 		elog(ERROR, "Backup cannot run on a standby.");
 
-	elog(INFO, "database backup start");
+	elog(LOG, "database backup start");
 
 	/* Initialize size summary */
 	current.data_bytes = 0;
@@ -447,6 +447,12 @@ wait_for_archive(pgBackup *backup, const char *sql)
 	XLogSegNo	targetSegNo;
 
 	reconnect();
+
+	/* Remove annoying NOTICE messages generated by backend */
+	res = execute("SET client_min_messages = warning;", 0, NULL);
+	PQclear(res);
+
+	/* And execute the query wanted */
 	res = execute(sql, 0, NULL);
 
 	/* Get LSN from execution result */
diff --git a/contrib/pg_arman/expected/delete.out b/contrib/pg_arman/expected/delete.out
@@ -1,19 +1,12 @@
 \! bash sql/delete.sh
 ###### DELETE COMMAND TEST-0001 ######
 ###### delete full backups ######
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
 try to delete the oldest backup
 2
 1
 Number of deleted backups should be 1, is it so?: 1
 ###### DELETE COMMAND TEST-0002 ######
 ###### keep backups which are necessary for recovery ######
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
 try to delete before third backup
 3
 1
diff --git a/contrib/pg_arman/expected/show.out b/contrib/pg_arman/expected/show.out
@@ -1,7 +1,6 @@
 \! bash sql/show.sh
 ###### SHOW COMMAND TEST-0001 ######
 ###### Status DONE and OK ######
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
 0
 OK: DONE status is shown properly.
 0
@@ -10,22 +9,18 @@ OK: OK status is shown properly.
 ###### SHOW COMMAND TEST-0002 ######
 ###### Status RUNNING  ######
 OK: RUNNING status is shown properly.
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
 
 ###### SHOW COMMAND TEST-0003 ######
 ###### Status CORRUPT ######
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
 0
 remove a file from backup intentionally
 0
 OK: CORRUPT status is shown properly.
 
 ###### SHOW COMMAND TEST-0004 ######
 ###### Status DELETED ######
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
 0
 0
-NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
 0
 0
 0

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`
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`