Fix verify_metadata not returning consistent results (#3199)

Failing test: https://app.circleci.com/jobs/github/citusdata/citus/58827
pull/3202/head^2
Jelte Fennema 2019-11-19 11:02:35 +01:00 committed by GitHub
parent e3ad4aba94
commit 87f57eb92b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -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

View File

@ -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