Commit9e6b7b4

committed

Fix timing issue in deadlock recovery conflict test.

1 parentc40ba5f commit9e6b7b4Copy full SHA for 9e6b7b4

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,14 @@`
`226`	`226`	`$sect ="startup deadlock";`
`227`	`227`	`$expected_conflicts++;`
`228`	`228`
	`229`	`+# Want to test recovery deadlock conflicts, not buffer pin conflicts. Without`
	`230`	`+# changing max_standby_streaming_delay it'd be timing dependent what we hit`
	`231`	`+# first`
	`232`	`+$node_standby->adjust_conf('postgresql.conf','max_standby_streaming_delay',`
	`233`	`+"${PostgreSQL::Test::Utils::timeout_default}s");`
	`234`	`+$node_standby->restart();`
	`235`	`+reconnect_and_clear();`
	`236`	`+`
`229`	`237`	`# Generate a few dead rows, to later be cleaned up by vacuum. Then acquire a`
`230`	`238`	`# lock on another relation in a prepared xact, so it's held continuously by`
`231`	`239`	`# the startup process. The standby psql will block acquiring that lock while`
`@@ -281,6 +289,9 @@`
`281`	`289`
`282`	`290`	`# clean up for next tests`
`283`	`291`	`$node_primary->safe_psql($test_db,qq[ROLLBACK PREPARED 'lock';]);`
	`292`	`+$node_standby->adjust_conf('postgresql.conf','max_standby_streaming_delay','50ms');`
	`293`	`+$node_standby->restart();`
	`294`	`+reconnect_and_clear();`
`284`	`295`
`285`	`296`
`286`	`297`	`# Check that expected number of conflicts show in pg_stat_database. Needs to`

Comments

(0)