NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commiteda4ef8

committed

stats regression test's wait_for_stats() must check timestamp too.

pg_stat_get_snapshot_timestamp() returns the timestamp seen in the "global"stats file. Because pgstat_write_statsfiles() writes per-DB stats filesbefore the global file (or at least before renaming it into place), thereis a window where the test backend can see all the stats updates thatwait_for_stats() was checking for (all of which come from the per-DB file)but also see the same global stats file it had seen at the start of thetest script. This results in a failure in only the "snapshot_newer" query,as reported by a couple of buildfarm members recently.I suspect that this ought to be back-patched. Commit4e37b3e hasevidently increased the probability of this window getting hit, butit's not apparent why it could not have been hit before. I'll refrainfor the moment though.

1 parentde7cca9 commiteda4ef8Copy full SHA for eda4ef8

File tree

2 files changed

+16

-2

lines changed

src/test/regress
- expected
  - stats.out
- sql
  - stats.sql

2 files changed

+16

-2

lines changed

`‎src/test/regress/expected/stats.out`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ declare`
`32`	`32`	`updated1 bool;`
`33`	`33`	`updated2 bool;`
`34`	`34`	`updated3 bool;`
	`35`	`+ updated4 bool;`
`35`	`36`	`begin`
`36`	`37`	`-- we don't want to wait forever; loop will exit after 30 seconds`
`37`	`38`	`for i in 1 .. 300 loop`
`@@ -55,7 +56,13 @@ begin`
`55`	`56`	`SELECT (n_tup_ins > 0) INTO updated3`
`56`	`57`	`FROM pg_stat_user_tables WHERE relname='trunc_stats_test4';`
`57`	`58`
`58`		`- exit when updated1 and updated2 and updated3;`
	`59`	`+ -- We must also check explicitly that pg_stat_get_snapshot_timestamp has`
	`60`	`+ -- advanced, because that comes from the global stats file which might`
	`61`	`+ -- be older than the per-DB stats file we got the other values from.`
	`62`	`+ SELECT (pr.snap_ts < pg_stat_get_snapshot_timestamp()) INTO updated4`
	`63`	`+ FROM prevstats AS pr;`
	`64`	`+`
	`65`	`+ exit when updated1 and updated2 and updated3 and updated4;`
`59`	`66`
`60`	`67`	`-- wait a little`
`61`	`68`	`perform pg_sleep_for('100 milliseconds');`

`‎src/test/regress/sql/stats.sql`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ declare`
`31`	`31`	`updated1 bool;`
`32`	`32`	`updated2 bool;`
`33`	`33`	`updated3 bool;`
	`34`	`+ updated4 bool;`
`34`	`35`	`begin`
`35`	`36`	`-- we don't want to wait forever; loop will exit after 30 seconds`
`36`	`37`	`for iin1 ..300 loop`
`@@ -54,7 +55,13 @@ begin`
`54`	`55`	`SELECT (n_tup_ins>0) INTO updated3`
`55`	`56`	`FROM pg_stat_user_tablesWHERE relname='trunc_stats_test4';`
`56`	`57`
`57`		`- exit when updated1and updated2and updated3;`
	`58`	`+-- We must also check explicitly that pg_stat_get_snapshot_timestamp has`
	`59`	`+-- advanced, because that comes from the global stats file which might`
	`60`	`+-- be older than the per-DB stats file we got the other values from.`
	`61`	`+SELECT (pr.snap_ts< pg_stat_get_snapshot_timestamp()) INTO updated4`
	`62`	`+FROM prevstatsAS pr;`
	`63`	`+`
	`64`	`+ exit when updated1and updated2and updated3and updated4;`
`58`	`65`
`59`	`66`	`-- wait a little`
`60`	`67`	`perform pg_sleep_for('100 milliseconds');`

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!

Commiteda4ef8

File tree

2 files changed

2 files changed

`‎src/test/regress/expected/stats.out`

`‎src/test/regress/sql/stats.sql`

0 commit comments