From a0b71da960ada0f5f8927920486e8a7096ac975b Mon Sep 17 00:00:00 2001 From: Michael Banck Date: Tue, 10 Jun 2025 22:55:44 +0200 Subject: [PATCH] Stabilize stats_reset-based tests for low-resolution timers. On systems where the timestamp resolution is 10ms, two stats reset calls in quick sucession and the comparison of their timestamps might not lead to differences. Add 10ms pg_sleep() calls in order to ensure different timestamps on those systems. For the last_seq_scan timestamps tests we use 100ms pg_sleep() delays, which we could reconsider adjusting to 10ms as well giving nobody else complained about the stat reset tests without delay. --- src/test/regress/expected/stats.out | 18 ++++++++++++++++++ src/test/regress/expected/subscription.out | 6 ++++++ src/test/regress/sql/stats.sql | 3 +++ src/test/regress/sql/subscription.sql | 1 + 4 files changed, 28 insertions(+) diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out index 776f1ad0e53..803f4eac8ff 100644 --- a/src/test/regress/expected/stats.out +++ b/src/test/regress/expected/stats.out @@ -983,6 +983,12 @@ SELECT stats_reset > :'slru_commit_ts_reset_ts'::timestamptz FROM pg_stat_slru W SELECT stats_reset AS slru_commit_ts_reset_ts FROM pg_stat_slru WHERE name = 'commit_timestamp' \gset -- Test that multiple SLRUs are reset when no specific SLRU provided to reset function +SELECT pg_sleep(0.01); -- assume a minimum timestamp granularity of 10ms + pg_sleep +---------- + +(1 row) + SELECT pg_stat_reset_slru(); pg_stat_reset_slru -------------------- @@ -1059,6 +1065,12 @@ SELECT stats_reset > :'recovery_prefetch_reset_ts'::timestamptz FROM pg_stat_rec -- Test that reset_shared with slru specified as the stats type works SELECT max(stats_reset) AS slru_reset_ts FROM pg_stat_slru \gset +SELECT pg_sleep(0.01); + pg_sleep +---------- + +(1 row) + SELECT pg_stat_reset_shared('slru'); pg_stat_reset_shared ---------------------- @@ -1098,6 +1110,12 @@ SELECT pg_stat_reset(); (1 row) SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset +SELECT pg_sleep(0.01); + pg_sleep +---------- + +(1 row) + SELECT pg_stat_reset(); pg_stat_reset --------------- diff --git a/src/test/regress/expected/subscription.out b/src/test/regress/expected/subscription.out index 1443e1d9292..a2baa599769 100644 --- a/src/test/regress/expected/subscription.out +++ b/src/test/regress/expected/subscription.out @@ -61,6 +61,12 @@ SELECT subname, stats_reset IS NULL stats_reset_is_null FROM pg_stat_subscriptio -- Reset the stats again and check if the new reset_stats is updated. SELECT stats_reset as prev_stats_reset FROM pg_stat_subscription_stats WHERE subname = 'regress_testsub' \gset +SELECT pg_sleep(0.01); -- assume a minimum timestamp granularity of 10ms + pg_sleep +---------- + +(1 row) + SELECT pg_stat_reset_subscription_stats(oid) FROM pg_subscription WHERE subname = 'regress_testsub'; pg_stat_reset_subscription_stats ---------------------------------- diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql index 232ab8db8fa..b78dc0c670d 100644 --- a/src/test/regress/sql/stats.sql +++ b/src/test/regress/sql/stats.sql @@ -467,6 +467,7 @@ SELECT stats_reset > :'slru_commit_ts_reset_ts'::timestamptz FROM pg_stat_slru W SELECT stats_reset AS slru_commit_ts_reset_ts FROM pg_stat_slru WHERE name = 'commit_timestamp' \gset -- Test that multiple SLRUs are reset when no specific SLRU provided to reset function +SELECT pg_sleep(0.01); -- assume a minimum timestamp granularity of 10ms SELECT pg_stat_reset_slru(); SELECT stats_reset > :'slru_commit_ts_reset_ts'::timestamptz FROM pg_stat_slru WHERE name = 'commit_timestamp'; SELECT stats_reset > :'slru_notify_reset_ts'::timestamptz FROM pg_stat_slru WHERE name = 'notify'; @@ -493,6 +494,7 @@ SELECT stats_reset > :'recovery_prefetch_reset_ts'::timestamptz FROM pg_stat_rec -- Test that reset_shared with slru specified as the stats type works SELECT max(stats_reset) AS slru_reset_ts FROM pg_stat_slru \gset +SELECT pg_sleep(0.01); SELECT pg_stat_reset_shared('slru'); SELECT max(stats_reset) > :'slru_reset_ts'::timestamptz FROM pg_stat_slru; @@ -509,6 +511,7 @@ SELECT pg_stat_reset_shared('unknown'); -- Since pg_stat_database stats_reset starts out as NULL, reset it once first so we have something to compare it to SELECT pg_stat_reset(); SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset +SELECT pg_sleep(0.01); SELECT pg_stat_reset(); SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = (SELECT current_database()); diff --git a/src/test/regress/sql/subscription.sql b/src/test/regress/sql/subscription.sql index 007c9e70374..d0ec8d18fa1 100644 --- a/src/test/regress/sql/subscription.sql +++ b/src/test/regress/sql/subscription.sql @@ -39,6 +39,7 @@ SELECT subname, stats_reset IS NULL stats_reset_is_null FROM pg_stat_subscriptio -- Reset the stats again and check if the new reset_stats is updated. SELECT stats_reset as prev_stats_reset FROM pg_stat_subscription_stats WHERE subname = 'regress_testsub' \gset +SELECT pg_sleep(0.01); -- assume a minimum timestamp granularity of 10ms SELECT pg_stat_reset_subscription_stats(oid) FROM pg_subscription WHERE subname = 'regress_testsub'; SELECT :'prev_stats_reset' < stats_reset FROM pg_stat_subscription_stats WHERE subname = 'regress_testsub'; -- 2.39.5