From 87f57eb92b04b3581f151120a6a1b40507685f5e Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Tue, 19 Nov 2019 11:02:35 +0100 Subject: [PATCH] Fix verify_metadata not returning consistent results (#3199) Failing test: https://app.circleci.com/jobs/github/citusdata/citus/58827 --- src/test/regress/expected/multi_mx_node_metadata.out | 3 ++- src/test/regress/sql/multi_mx_node_metadata.sql | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/regress/expected/multi_mx_node_metadata.out b/src/test/regress/expected/multi_mx_node_metadata.out index f42130e35..03a07814e 100644 --- a/src/test/regress/expected/multi_mx_node_metadata.out +++ b/src/test/regress/expected/multi_mx_node_metadata.out @@ -26,6 +26,7 @@ CREATE FUNCTION verify_metadata(hostname TEXT, port INTEGER, master_port INTEGER RETURNS BOOLEAN LANGUAGE sql AS $$ +SELECT wait_until_metadata_sync(); WITH dist_node_summary AS ( SELECT 'SELECT jsonb_agg(ROW(nodeid, groupid, nodename, nodeport, isactive) ORDER BY nodeid) FROM pg_dist_node' as query ), dist_node_check AS ( @@ -46,7 +47,7 @@ WITH dist_node_summary AS ( SELECT dist_node_check.matches AND dist_placement_check.matches FROM dist_node_check CROSS JOIN dist_placement_check $$; --- Simulates a readonly node by setting default_transaction_read_only. +-- Simulates a readonly node by setting default_transaction_read_only. CREATE FUNCTION mark_node_readonly(hostname TEXT, port INTEGER, isreadonly BOOLEAN) RETURNS TEXT LANGUAGE sql diff --git a/src/test/regress/sql/multi_mx_node_metadata.sql b/src/test/regress/sql/multi_mx_node_metadata.sql index 5907b8a76..1ff77325c 100644 --- a/src/test/regress/sql/multi_mx_node_metadata.sql +++ b/src/test/regress/sql/multi_mx_node_metadata.sql @@ -27,6 +27,7 @@ CREATE FUNCTION verify_metadata(hostname TEXT, port INTEGER, master_port INTEGER RETURNS BOOLEAN LANGUAGE sql AS $$ +SELECT wait_until_metadata_sync(); WITH dist_node_summary AS ( SELECT 'SELECT jsonb_agg(ROW(nodeid, groupid, nodename, nodeport, isactive) ORDER BY nodeid) FROM pg_dist_node' as query ), dist_node_check AS ( @@ -48,7 +49,7 @@ SELECT dist_node_check.matches AND dist_placement_check.matches FROM dist_node_check CROSS JOIN dist_placement_check $$; --- Simulates a readonly node by setting default_transaction_read_only. +-- Simulates a readonly node by setting default_transaction_read_only. CREATE FUNCTION mark_node_readonly(hostname TEXT, port INTEGER, isreadonly BOOLEAN) RETURNS TEXT LANGUAGE sql