database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

pgstat: fix stats.spec instability on slow machines.

Browse Source 
On slow machines the modified test could end up switching the order in which
transactional stats are reported in one session and non-transactional stats in
another session. As stats handling of truncate is implemented as setting
live/dead rows 0, the order in which a truncate's stats changes are applied,
relative to normal stats updates, matters. The handling of stats for truncate
hasn't changed due to shared memory stats, this is longstanding behavior.

We might want to improve truncate's stats handling in the future, but for now
just change the order of forced flushed to make the test stable.

Reported-By: Christoph Berg <myon@debian.org>
Discussion: https://postgr.es/m/YoZf7U/WmfmFYFEx@msg.df7cb.de
This commit is contained in:
Andres Freund 2022-05-22 15:09:50 -07:00
parent c7461fc255
commit 7fdbdf2049
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/isolation/expected/stats.out
View File

@ -2812,7 +2812,7 @@ seq_scan|seq_tup_read|n_tup_ins|n_tup_upd|n_tup_del|n_live_tup|n_dead_tup|vacuum
(1 row) (1 row)
starting permutation: s1_table_insert s1_begin s1_table_update_k1 s1_table_update_k1 s1_table_truncate s1_table_insert_k1 s1_table_update_k1 s1_prepare_a s2_commit_prepared_a s1_ff s2_ff s1_table_stats starting permutation: s1_table_insert s1_begin s1_table_update_k1 s1_table_update_k1 s1_table_truncate s1_table_insert_k1 s1_table_update_k1 s1_prepare_a s1_ff s2_commit_prepared_a s2_ff s1_table_stats
pg_stat_force_next_flush pg_stat_force_next_flush
------------------------ ------------------------
@ -2826,13 +2826,13 @@ step s1_table_truncate: TRUNCATE test_stat_tab;
step s1_table_insert_k1: INSERT INTO test_stat_tab(key, value) VALUES('k1', 1); step s1_table_insert_k1: INSERT INTO test_stat_tab(key, value) VALUES('k1', 1);
step s1_table_update_k1: UPDATE test_stat_tab SET value = value + 1 WHERE key = 'k1'; step s1_table_update_k1: UPDATE test_stat_tab SET value = value + 1 WHERE key = 'k1';
step s1_prepare_a: PREPARE TRANSACTION 'a'; step s1_prepare_a: PREPARE TRANSACTION 'a';
step s2_commit_prepared_a: COMMIT PREPARED 'a';
step s1_ff: SELECT pg_stat_force_next_flush(); step s1_ff: SELECT pg_stat_force_next_flush();
pg_stat_force_next_flush pg_stat_force_next_flush
------------------------ ------------------------
(1 row) (1 row)
step s2_commit_prepared_a: COMMIT PREPARED 'a';
step s2_ff: SELECT pg_stat_force_next_flush(); step s2_ff: SELECT pg_stat_force_next_flush();
pg_stat_force_next_flush pg_stat_force_next_flush
------------------------ ------------------------

6
src/test/isolation/expected/stats_1.out
View File

@ -2826,7 +2826,7 @@ seq_scan|seq_tup_read|n_tup_ins|n_tup_upd|n_tup_del|n_live_tup|n_dead_tup|vacuum
(1 row) (1 row)
starting permutation: s1_table_insert s1_begin s1_table_update_k1 s1_table_update_k1 s1_table_truncate s1_table_insert_k1 s1_table_update_k1 s1_prepare_a s2_commit_prepared_a s1_ff s2_ff s1_table_stats starting permutation: s1_table_insert s1_begin s1_table_update_k1 s1_table_update_k1 s1_table_truncate s1_table_insert_k1 s1_table_update_k1 s1_prepare_a s1_ff s2_commit_prepared_a s2_ff s1_table_stats
pg_stat_force_next_flush pg_stat_force_next_flush
------------------------ ------------------------
@ -2841,14 +2841,14 @@ step s1_table_insert_k1: INSERT INTO test_stat_tab(key, value) VALUES('k1', 1);
step s1_table_update_k1: UPDATE test_stat_tab SET value = value + 1 WHERE key = 'k1'; step s1_table_update_k1: UPDATE test_stat_tab SET value = value + 1 WHERE key = 'k1';
step s1_prepare_a: PREPARE TRANSACTION 'a'; step s1_prepare_a: PREPARE TRANSACTION 'a';
ERROR: prepared transactions are disabled ERROR: prepared transactions are disabled
step s2_commit_prepared_a: COMMIT PREPARED 'a';
ERROR: prepared transaction with identifier "a" does not exist
step s1_ff: SELECT pg_stat_force_next_flush(); step s1_ff: SELECT pg_stat_force_next_flush();
pg_stat_force_next_flush pg_stat_force_next_flush
------------------------ ------------------------
(1 row) (1 row)
step s2_commit_prepared_a: COMMIT PREPARED 'a';
ERROR: prepared transaction with identifier "a" does not exist
step s2_ff: SELECT pg_stat_force_next_flush(); step s2_ff: SELECT pg_stat_force_next_flush();
pg_stat_force_next_flush pg_stat_force_next_flush
------------------------ ------------------------

3
src/test/isolation/specs/stats.spec
View File

@ -562,8 +562,9 @@ permutation
s1_table_insert_k1 # should be counted s1_table_insert_k1 # should be counted
s1_table_update_k1 # dito s1_table_update_k1 # dito
s1_prepare_a s1_prepare_a
s1_ff # flush out non-transactional stats, might happen anyway
s2_commit_prepared_a s2_commit_prepared_a
s1_ff s2_ff s2_ff
s1_table_stats s1_table_stats
# S1 prepares, S1 aborts prepared # S1 prepares, S1 aborts prepared