Commit7f47088

committed

Fix query in new test to check tables are synced

Rather than looking for tablesync workers, it is more reliable to seethe sync state of the tables.Per note from Amit Kapila.Discussion:https://postgr.es/m/CAA4eK1JSSD7FVwq+_rOme86jUZTQFzjsNU06hQ4-LiRt1xFmSg@mail.gmail.com

1 parent86dba33 commit7f47088Copy full SHA for 7f47088

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,13 @@`
`141`	`141`
`142`	`142`	`# We cannot rely solely on wait_for_catchup() here; it isn't sufficient`
`143`	`143`	`# when tablesync workers might still be running. So in addition to that,`
`144`		`-#weverify thatno tablesync workers appear for the subscription.`
	`144`	`+# verify thattables are synced.`
`145`	`145`	`# XXX maybe this should be integrated in wait_for_catchup() itself.`
`146`	`146`	`$node_twoways->wait_for_catchup('testsub');`
`147`		`-$node_twoways->poll_query_until(`
`148`		`-'d2',`
`149`		`-"SELECT count(*) FROM pg_stat_subscription WHERE subname = 'testsub' AND relid <> 0",`
`150`		`-"0");`
	`147`	`+my$synced_query =`
	`148`	`+"SELECT count(1) = 0 FROM pg_subscription_rel WHERE srsubstate NOT IN ('r', 's');";`
	`149`	`+$node_twoways->poll_query_until('d2',$synced_query)`
	`150`	`+ordie"Timed out while waiting for subscriber to synchronize data";`
`151`	`151`
`152`	`152`	`is($node_twoways->safe_psql('d2',"SELECT count(f) FROM t"),`
`153`	`153`	`$rows * 2,"2x$rows rows in t");`

Comments

(0)