From 57839c7664c608ea8bf3bc9fa1132f29656a9e65 Mon Sep 17 00:00:00 2001 From: Diego Fronza Date: Tue, 21 Dec 2021 11:06:06 -0300 Subject: [PATCH] PG-295: Fix top_query regression test. The issue is that between changing GUC "track" from track='top' to track='all' the queries are executing using previous state of track='top', to fix that we sleep 1 second after calling pg_reload_conf() to ensure that queries will run with new settings. --- regression/expected/top_query.out | 12 ++++++++++++ regression/expected/top_query_1.out | 12 ++++++++++++ regression/sql/top_query.sql | 2 ++ 3 files changed, 26 insertions(+) diff --git a/regression/expected/top_query.out b/regression/expected/top_query.out index e980297..6b118ff 100644 --- a/regression/expected/top_query.out +++ b/regression/expected/top_query.out @@ -48,6 +48,12 @@ SELECT pg_reload_conf(); t (1 row) +SELECT pg_sleep(1); + pg_sleep +---------- + +(1 row) + SELECT pg_stat_monitor_reset(); pg_stat_monitor_reset ----------------------- @@ -98,6 +104,12 @@ SELECT pg_reload_conf(); t (1 row) +SELECT pg_sleep(1); + pg_sleep +---------- + +(1 row) + SELECT pg_stat_monitor_reset(); pg_stat_monitor_reset ----------------------- diff --git a/regression/expected/top_query_1.out b/regression/expected/top_query_1.out index 59a19e5..a98455b 100644 --- a/regression/expected/top_query_1.out +++ b/regression/expected/top_query_1.out @@ -48,6 +48,12 @@ SELECT pg_reload_conf(); t (1 row) +SELECT pg_sleep(1); + pg_sleep +---------- + +(1 row) + SELECT pg_stat_monitor_reset(); pg_stat_monitor_reset ----------------------- @@ -98,6 +104,12 @@ SELECT pg_reload_conf(); t (1 row) +SELECT pg_sleep(1); + pg_sleep +---------- + +(1 row) + SELECT pg_stat_monitor_reset(); pg_stat_monitor_reset ----------------------- diff --git a/regression/sql/top_query.sql b/regression/sql/top_query.sql index 16aa2ce..b25ca05 100644 --- a/regression/sql/top_query.sql +++ b/regression/sql/top_query.sql @@ -19,6 +19,7 @@ SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C"; ALTER SYSTEM SET pg_stat_monitor.track TO 'all'; SELECT pg_reload_conf(); +SELECT pg_sleep(1); SELECT pg_stat_monitor_reset(); CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS @@ -38,6 +39,7 @@ SELECT add2(1,2); SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C"; ALTER SYSTEM SET pg_stat_monitor.track TO 'top'; SELECT pg_reload_conf(); +SELECT pg_sleep(1); SELECT pg_stat_monitor_reset(); DROP EXTENSION pg_stat_monitor;