diff --git a/src/test/regress/expected/isolation_citus_pause_node.out b/src/test/regress/expected/isolation_citus_pause_node.out index 78a07c68a..0307bc355 100644 --- a/src/test/regress/expected/isolation_citus_pause_node.out +++ b/src/test/regress/expected/isolation_citus_pause_node.out @@ -4,14 +4,35 @@ starting permutation: s1-begin s1-pause-node s2-begin s2-insert s2-end s1-end step s1-begin: BEGIN; +s1: NOTICE: step s1-pause-node: - SELECT pg_catalog.citus_pause_node(2); - -citus_pause_node ---------------------------------------------------------------------- - -(1 row) +SET client_min_messages = 'notice'; +DO $$ +DECLARE + v_shard_id int; + v_node_id int; + v_node_name text; + v_node_port int; +BEGIN +--The first message in the block is being printed on the top of the code block. So adding a dummy message +--to make sure that the first message is printed in correct place. + raise notice ''; + -- Get the shard id for the distribution column + SELECT get_shard_id_for_distribution_column('employee', 3) into v_shard_id; + --Get the node id for the shard id + SELECT nodename,nodeport into v_node_name,v_node_port FROM citus_shards WHERE shardid = v_shard_id limit 1; + raise notice 'node name is %',v_node_name; + raise notice 'node port is %',v_node_port; + -- Get the node id for the shard id + SELECT nodeid into v_node_id FROM pg_dist_node WHERE nodename = v_node_name and nodeport = v_node_port limit 1; + -- Pause the node + perform pg_catalog.citus_pause_node(v_node_id) ; +END; +$$ +LANGUAGE plpgsql; +s1: NOTICE: node name is localhost +s1: NOTICE: node port is 57638 step s2-begin: BEGIN; @@ -22,13 +43,13 @@ step s2-insert: -- Variable to track if the INSERT statement was successful DO $$ DECLARE - insert_successful BOOLEAN := FALSE; + v_insert_successful BOOLEAN := FALSE; BEGIN -- Execute the INSERT statement insert into employee values(11,'e11',3); -- If we reach this point, the INSERT statement was successful - insert_successful := TRUE; - IF insert_successful THEN + v_insert_successful := TRUE; + IF v_insert_successful THEN RAISE NOTICE 'INSERT statement completed successfully. This means that citus_pause_node could not get the lock.'; END IF; -- You can add additional processing here if needed diff --git a/src/test/regress/spec/isolation_citus_pause_node.spec b/src/test/regress/spec/isolation_citus_pause_node.spec index 8e5eb8858..77af5dfd6 100644 --- a/src/test/regress/spec/isolation_citus_pause_node.spec +++ b/src/test/regress/spec/isolation_citus_pause_node.spec @@ -52,7 +52,10 @@ step "s1-pause-node" v_node_name text; v_node_port int; BEGIN - -- Get the shard id for the distribution column + --The first message in the block is being printed on the top of the code block. So adding a dummy message + --to make sure that the first message is printed in correct place. + raise notice ''; + -- Get the shard id for the distribution column SELECT get_shard_id_for_distribution_column('employee', 3) into v_shard_id; --Get the node id for the shard id @@ -62,7 +65,6 @@ step "s1-pause-node" -- Get the node id for the shard id SELECT nodeid into v_node_id FROM pg_dist_node WHERE nodename = v_node_name and nodeport = v_node_port limit 1; - raise notice 'node id is %',v_node_id; -- Pause the node