Removes timeouts

citusdata · Aug 24, 2023 · c4d694e · c4d694e
1 parent ecc675b
commit c4d694e
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 201 deletions.
diff --git a/src/test/regress/expected/isolation_citus_pause_node.out b/src/test/regress/expected/isolation_citus_pause_node.out
@@ -1,9 +1,12 @@
 Parsed test spec with 2 sessions
 
-starting permutation: s1-begin s1-pause-node s2-begin s2-insert-distributed s2-end s1-end
+starting permutation: s1-begin s2-begin s1-pause-node s2-insert-distributed s1-end s2-end
 step s1-begin:
     BEGIN;
 
+step s2-begin:
+ BEGIN;
+
 s1: NOTICE:
 step s1-pause-node:
  SET client_min_messages = 'notice';
@@ -33,124 +36,33 @@ step s1-pause-node:
 
 s1: NOTICE:  node name is localhost
 s1: NOTICE:  node port is 57638
-step s2-begin:
- BEGIN;
-
 step s2-insert-distributed:
  -- Set statement_timeout for the session (in milliseconds)
- SET statement_timeout = 1000; -- 1 seconds
  SET client_min_messages = 'notice';
  -- Variable to track if the INSERT statement was successful
  DO $$
- DECLARE
-  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
-  v_insert_successful := TRUE;
-  IF v_insert_successful THEN
-   RAISE NOTICE 'INSERT statement completed successfully. This means that citus_pause_node_within_txn could not get the lock.';
-  END IF;
- -- You can add additional processing here if needed
- EXCEPTION
-  WHEN query_canceled THEN
-   -- The INSERT statement was canceled due to timeout
-   RAISE NOTICE 'query_canceled exception raised. This means that citus_pause_node_within_txn was able to get the lock.';
-  WHEN OTHERS THEN
-   -- Any other exception raised during the INSERT statement
-   RAISE;
  END;
  $$
  LANGUAGE plpgsql;
  <waiting ...>
+step s1-end: 
+    COMMIT;
+
 step s2-insert-distributed: <... completed>
-s2: NOTICE:  query_canceled exception raised. This means that citus_pause_node_within_txn was able to get the lock.
 step s2-end:
  COMMIT;
 
-step s1-end:
-    COMMIT;
 
-
-starting permutation: s1-begin s1-pause-node-force s2-begin s2-insert-distributed s2-end s1-end
+starting permutation: s1-begin s2-begin s1-pause-node s2-delete-distributed s1-end s2-end
 step s1-begin:
     BEGIN;
 
-s1: NOTICE:
-step s1-pause-node-force:
- SET client_min_messages = 'notice';
- DO $$
- DECLARE
-  v_shard_id int;
-  v_node_id int;
-  v_node_name text;
-  v_node_port int;
-  v_force boolean := true;
- 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 with force true
-  perform pg_catalog.citus_pause_node_within_txn(v_node_id,v_force) ;
- END;
- $$
- LANGUAGE plpgsql;
-
-s1: NOTICE:  node name is localhost
-s1: NOTICE:  node port is 57638
 step s2-begin:
  BEGIN;
 
-step s2-insert-distributed:
- -- Set statement_timeout for the session (in milliseconds)
- SET statement_timeout = 1000; -- 1 seconds
- SET client_min_messages = 'notice';
- -- Variable to track if the INSERT statement was successful
- DO $$
- DECLARE
-  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
-  v_insert_successful := TRUE;
-  IF v_insert_successful THEN
-   RAISE NOTICE 'INSERT statement completed successfully. This means that citus_pause_node_within_txn could not get the lock.';
-  END IF;
- -- You can add additional processing here if needed
- EXCEPTION
-  WHEN query_canceled THEN
-   -- The INSERT statement was canceled due to timeout
-   RAISE NOTICE 'query_canceled exception raised. This means that citus_pause_node_within_txn was able to get the lock.';
-  WHEN OTHERS THEN
-   -- Any other exception raised during the INSERT statement
-   RAISE;
- END;
- $$
- LANGUAGE plpgsql;
- <waiting ...>
-step s2-insert-distributed: <... completed>
-s2: NOTICE:  query_canceled exception raised. This means that citus_pause_node_within_txn was able to get the lock.
-step s2-end:
- COMMIT;
-
-step s1-end:
-    COMMIT;
-
-
-starting permutation: s1-begin s1-pause-node s2-begin s2-delete-distributed s2-end s1-end
-step s1-begin:
-    BEGIN;
-
 s1: NOTICE:
 step s1-pause-node:
  SET client_min_messages = 'notice';
@@ -180,47 +92,27 @@ step s1-pause-node:
 
 s1: NOTICE:  node name is localhost
 s1: NOTICE:  node port is 57638
-step s2-begin:
- BEGIN;
-
 step s2-delete-distributed:
  -- Set statement_timeout for the session (in milliseconds)
- SET statement_timeout = 1000; -- 1 seconds
  SET client_min_messages = 'notice';
  -- Variable to track if the DELETE statement was successful
  DO $$
- DECLARE
-  v_delete_successful BOOLEAN := FALSE;
  BEGIN
   -- Execute the DELETE statement
   delete from employee where id = 9;
-  -- If we reach this point, the DELETE statement was successful
-  v_delete_successful := TRUE;
-  IF v_delete_successful THEN
-   RAISE NOTICE 'DELETE statement completed successfully. This means that citus_pause_node_within_txn could not get the lock.';
-  END IF;
- -- You can add additional processing here if needed
- EXCEPTION
-  WHEN query_canceled THEN
-   -- The INSERT statement was canceled due to timeout
-   RAISE NOTICE 'query_canceled exception raised. This means that citus_pause_node_within_txn was able to get the lock.';
-  WHEN OTHERS THEN
-   -- Any other exception raised during the INSERT statement
-   RAISE;
  END;
  $$
  LANGUAGE plpgsql;
  <waiting ...>
+step s1-end: 
+    COMMIT;
+
 step s2-delete-distributed: <... completed>
-s2: NOTICE:  query_canceled exception raised. This means that citus_pause_node_within_txn was able to get the lock.
 step s2-end:
  COMMIT;
 
-step s1-end:
-    COMMIT;
-
 
-starting permutation: s1-begin s1-pause-node s2-begin s2-select-distributed s2-end s1-end
+starting permutation: s1-begin s1-pause-node s2-begin s2-select-distributed s1-end s2-end
 step s1-begin:
     BEGIN;
 
@@ -264,17 +156,20 @@ id|name|company_id
 10|e10 |         3
 (1 row)
 
-step s2-end:
- COMMIT;
-
 step s1-end:
     COMMIT;
 
+step s2-end:
+ COMMIT;
 
-starting permutation: s1-begin s1-pause-node s2-begin s2-insert-reference s2-end s1-end
+
+starting permutation: s1-begin s2-begin s1-pause-node s2-insert-reference s1-end s2-end
 step s1-begin:
     BEGIN;
 
+step s2-begin:
+ BEGIN;
+
 s1: NOTICE:
 step s1-pause-node:
  SET client_min_messages = 'notice';
@@ -304,43 +199,26 @@ step s1-pause-node:
 
 s1: NOTICE:  node name is localhost
 s1: NOTICE:  node port is 57638
-step s2-begin:
- BEGIN;
-
 step s2-insert-reference:
  -- Set statement_timeout for the session (in milliseconds)
  SET statement_timeout = 1000; -- 1 seconds
  SET client_min_messages = 'notice';
  -- Variable to track if the INSERT statement was successful
  DO $$
- DECLARE
-  v_insert_successful BOOLEAN := FALSE;
  BEGIN
   -- Execute the INSERT statement
   insert into city values(3,'city3');
-  -- If we reach this point, the INSERT statement was successful
-  v_insert_successful := TRUE;
-  IF v_insert_successful THEN
-   RAISE NOTICE 'INSERT statement completed successfully. This means that citus_pause_node_within_txn could not get the lock.';
-  END IF;
- EXCEPTION WHEN query_canceled THEN
-  -- The INSERT statement was canceled due to timeout
-  RAISE NOTICE 'query_canceled exception raised. This means that citus_pause_node_within_txn was able to get the lock.';
-  WHEN OTHERS THEN
-   -- Any other exception raised during the INSERT statement
-   RAISE;
  END;
  $$
  LANGUAGE plpgsql;
  <waiting ...>
+step s1-end: 
+    COMMIT;
+
 step s2-insert-reference: <... completed>
-s2: NOTICE:  query_canceled exception raised. This means that citus_pause_node_within_txn was able to get the lock.
 step s2-end:
  COMMIT;
 
-step s1-end:
-    COMMIT;
-
 
 starting permutation: s1-begin s1-pause-node s1-pause-node s1-end
 step s1-begin:
@@ -437,3 +315,62 @@ step s1-node-not-found:
 step s1-end:
     COMMIT;
 
+
+starting permutation: s1-begin s2-begin s2-insert-distributed s1-pause-node-force s2-end s1-end
+step s1-begin:
+    BEGIN;
+
+step s2-begin:
+ BEGIN;
+
+step s2-insert-distributed:
+ -- Set statement_timeout for the session (in milliseconds)
+ SET client_min_messages = 'notice';
+ -- Variable to track if the INSERT statement was successful
+ DO $$
+ BEGIN
+  -- Execute the INSERT statement
+  insert into employee values(11,'e11',3);
+ END;
+ $$
+ LANGUAGE plpgsql;
+
+s1: NOTICE:
+step s1-pause-node-force:
+ SET client_min_messages = 'notice';
+ DO $$
+ DECLARE
+  v_shard_id int;
+  v_node_id int;
+  v_node_name text;
+  v_node_port int;
+  v_force boolean := true;
+ 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 with force true
+  perform pg_catalog.citus_pause_node_within_txn(v_node_id,v_force) ;
+ END;
+ $$
+ LANGUAGE plpgsql;
+
+s1: NOTICE:  node name is localhost
+s1: NOTICE:  node port is 57638
+step s2-end:
+ COMMIT;
+
+FATAL:  terminating connection due to administrator command
+SSL connection has been closed unexpectedly
+
+step s1-end:
+    COMMIT;
+