NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit74d5842

committed

Apply last revision of recovery patch

I applied the previous-to-last revision of Michaël's submitted patchinstead of the last; these two tweaks pointed out by Craig were left outof the previous commit by accident.

1 parent4914864 commit74d5842Copy full SHA for 74d5842

File tree

2 files changed

-3

lines changed

src/test
- perl
  - PostgresNode.pm
- recovery/t
  - 001_stream_rep.pl

2 files changed

-3

lines changed

`‎src/test/perl/PostgresNode.pm‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ Streaming replication can be enabled on this node by passing the keyword`
`474`	`474`	`parameter has_streaming => 1. This is disabled by default.`
`475`	`475`
`476`	`476`	`Restoring WAL segments from archives using restore_command can be enabled`
`477`		`-bypassiong the keyword parameter has_restoring => 1. This is disabled by`
	`477`	`+bypassing the keyword parameter has_restoring => 1. This is disabled by`
`478`	`478`	`default.`
`479`	`479`
`480`	`480`	`The backup is copied, leaving the original unmodified. pg_hba.conf is`

`‎src/test/recovery/t/001_stream_rep.pl‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,11 @@`
`38`	`38`	`my$applname_1 =$node_standby_1->name;`
`39`	`39`	`my$applname_2 =$node_standby_2->name;`
`40`	`40`	`my$caughtup_query =`
`41`		`-"SELECT pg_current_xlog_location() = write_location FROM pg_stat_replication WHERE application_name = '$applname_1';";`
	`41`	`+"SELECT pg_current_xlog_location()<= write_location FROM pg_stat_replication WHERE application_name = '$applname_1';";`
`42`	`42`	`$node_master->poll_query_until('postgres',$caughtup_query)`
`43`	`43`	`ordie"Timed out while waiting for standby 1 to catch up";`
`44`	`44`	`$caughtup_query =`
`45`		`-"SELECT pg_last_xlog_replay_location() = write_location FROM pg_stat_replication WHERE application_name = '$applname_2';";`
	`45`	`+"SELECT pg_last_xlog_replay_location()<= write_location FROM pg_stat_replication WHERE application_name = '$applname_2';";`
`46`	`46`	`$node_standby_1->poll_query_until('postgres',$caughtup_query)`
`47`	`47`	`ordie"Timed out while waiting for standby 2 to catch up";`
`48`	`48`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit74d5842

File tree

2 files changed

2 files changed

`‎src/test/perl/PostgresNode.pm‎`

`‎src/test/recovery/t/001_stream_rep.pl‎`

0 commit comments