Commit5136967

committed

Fix timing issue in deadlock recovery conflict test.

1 parentf74496d commit5136967Copy full SHA for 5136967

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
`@@ -231,6 +231,14 @@`
`231`	`231`	`$sect ="startup deadlock";`
`232`	`232`	`$expected_conflicts++;`
`233`	`233`
	`234`	`+# Want to test recovery deadlock conflicts, not buffer pin conflicts. Without`
	`235`	`+# changing max_standby_streaming_delay it'd be timing dependent what we hit`
	`236`	`+# first`
	`237`	`+$node_standby->adjust_conf('postgresql.conf','max_standby_streaming_delay',`
	`238`	`+"${PostgreSQL::Test::Utils::timeout_default}s");`
	`239`	`+$node_standby->restart();`
	`240`	`+reconnect_and_clear();`
	`241`	`+`
`234`	`242`	`# Generate a few dead rows, to later be cleaned up by vacuum. Then acquire a`
`235`	`243`	`# lock on another relation in a prepared xact, so it's held continuously by`
`236`	`244`	`# the startup process. The standby psql will block acquiring that lock while`
`@@ -286,6 +294,9 @@`
`286`	`294`
`287`	`295`	`# clean up for next tests`
`288`	`296`	`$node_primary->safe_psql($test_db,qq[ROLLBACK PREPARED 'lock';]);`
	`297`	`+$node_standby->adjust_conf('postgresql.conf','max_standby_streaming_delay','50ms');`
	`298`	`+$node_standby->restart();`
	`299`	`+reconnect_and_clear();`
`289`	`300`
`290`	`301`
`291`	`302`	`# Check that expected number of conflicts show in pg_stat_database. Needs to`

Comments

(0)