Merge #148546 #150199

148546: roachtest/pg_regress: accept recent diffs r=yuzefovich a=yuzefovich

We now disable `create_table_with_schema_locked` (the default has recently changed to `true`).

Fixes: #148331.
Release note: None

150199: backup: increase max duration for restore fast fail tests r=msbutler a=kev-cao

Under enough load, the restore fast fail test is not able to complete restores in time before `MaxDuration` is hit, which causes test flakes because the restore quits early. This increases the duration in tests to reduce flakiness.

Fixes: #150197

Release note: None

Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: Kevin Cao <[email protected]>

Author: 3 people

pkg/backup/restore_test.go

@@ -105,11 +105,11 @@ func TestRestoreRetryFastFails(t *testing.T) {
 	// Max duration needs to be long enough such that the restore job
 	// runtime does not exceed the max duration of the retry policy, or
 	// else very few attempts will be made.
-	maxDuration := 100 * time.Millisecond
+	maxDuration := 500 * time.Millisecond
 	if skip.Stress() {
 		// Under stress, the restore will take longer to complete, so we need to
 		// increase max duration accordingly.
-		maxDuration = time.Second
+		maxDuration = 1500 * time.Millisecond
 	}
 	const numAccounts = 10
 

pkg/cmd/roachtest/testdata/pg_regress/alter_table.diffs

@@ -3816,10 +3816,10 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/alter_table.out -
  create temp view v2 as select * from v1;
  create or replace temp view v1 with (security_barrier = true)
    as select * from t1;
-+ERROR:  at or near "with": syntax error
++ERROR:  at or near "security_barrier": syntax error
 +DETAIL:  source SQL:
 +create or replace temp view v1 with (security_barrier = true)
-+                               ^
++                                     ^
 +HINT:  try \h CREATE
  create temp table log (q1 int8, q2 int8);
  create rule v1_upd_rule as on update to v1
@@ -4212,10 +4212,10 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/alter_table.out -
 +ERROR:  relation "my_locks" does not exist
  alter view my_locks set (autovacuum_enabled = false);
 -ERROR:  unrecognized parameter "autovacuum_enabled"
-+ERROR:  at or near "(": syntax error
++ERROR:  at or near "autovacuum_enabled": syntax error
 +DETAIL:  source SQL:
 +alter view my_locks set (autovacuum_enabled = false)
-+                        ^
++                         ^
 +HINT:  try \h ALTER VIEW
  alter table my_locks reset (autovacuum_enabled);
 +ERROR:  relation "my_locks" does not exist
@@ -4227,10 +4227,10 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/alter_table.out -
 +HINT:  try \h ALTER VIEW
  begin;
  alter view my_locks set (security_barrier=off);
-+ERROR:  at or near "(": syntax error
++ERROR:  at or near "security_barrier": syntax error
 +DETAIL:  source SQL:
 +alter view my_locks set (security_barrier=off)
-+                        ^
++                         ^
 +HINT:  try \h ALTER VIEW
  select * from my_locks order by 1;
 - relname  |    max_lockmode     

pkg/cmd/roachtest/testdata/pg_regress/create_procedure.diffs

@@ -16,7 +16,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
  HINT:  To call a function, use SELECT.
  CREATE FUNCTION cp_testfunc1(a int) RETURNS int LANGUAGE SQL AS $$ SELECT a $$;
  CREATE TABLE cp_test (a int, b text);
-@@ -16,47 +12,86 @@
+@@ -16,47 +12,91 @@
  INSERT INTO cp_test VALUES (1, x);
  $$;
  \df ptest1
@@ -51,9 +51,14 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
 - INSERT INTO cp_test VALUES (1, x);                  +
 - $procedure$                                         +
 - 
-+               pg_get_functiondef               
-+------------------------------------------------
-+ INSERT INTO root.public.cp_test VALUES (1, x);
++                   pg_get_functiondef                   
++--------------------------------------------------------
++ CREATE PROCEDURE public.ptest1(x STRING)              +
++         LANGUAGE SQL                                  +
++         SECURITY INVOKER                              +
++         AS $$                                         +
++         INSERT INTO root.public.cp_test VALUES (1, x);+
++ $$
  (1 row)
 
  -- show only normal functions
@@ -132,7 +137,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
  SELECT * FROM cp_test ORDER BY b COLLATE "C";
   a |   b   
  ---+-------
-@@ -71,34 +106,47 @@
+@@ -71,34 +111,47 @@
  BEGIN ATOMIC
    INSERT INTO cp_test VALUES (1, x);
  END;
@@ -199,7 +204,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
 
  -- utility functions currently not supported here
  CREATE PROCEDURE ptestx()
-@@ -106,13 +154,27 @@
+@@ -106,13 +159,27 @@
  BEGIN ATOMIC
    CREATE TABLE x (a int);
  END;
@@ -228,7 +233,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
  -- nested CALL
  TRUNCATE cp_test;
  CREATE PROCEDURE ptest3(y text)
-@@ -122,6 +184,9 @@
+@@ -122,6 +189,9 @@
  CALL ptest1($1);
  $$;
  CALL ptest3('b');
@@ -238,15 +243,15 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
  SELECT * FROM cp_test;
   a | b 
  ---+---
-@@ -147,7 +212,6 @@
+@@ -147,7 +217,6 @@
  CALL ptest4a(a, b);  -- error, not supported
  $$;
  ERROR:  calling procedures with output arguments is not supported in SQL functions
 -CONTEXT:  SQL function "ptest4b"
  DROP PROCEDURE ptest4a;
  -- named and default parameters
  CREATE OR REPLACE PROCEDURE ptest5(a int, b text, c int default 100)
-@@ -158,9 +222,23 @@
+@@ -158,9 +227,23 @@
  $$;
  TRUNCATE cp_test;
  CALL ptest5(10, 'Hello', 20);
@@ -270,7 +275,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
  SELECT * FROM cp_test;
    a  |   b   
  -----+-------
-@@ -168,11 +246,7 @@
+@@ -168,11 +251,7 @@
    20 | Hello
    10 | Hello
   100 | Hello
@@ -283,7 +288,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
 
  -- polymorphic types
  CREATE PROCEDURE ptest6(a int, b anyelement)
-@@ -181,6 +255,9 @@
+@@ -181,6 +260,9 @@
  SELECT NULL::int;
  $$;
  CALL ptest6(1, 2);
@@ -293,7 +298,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
  -- collation assignment
  CREATE PROCEDURE ptest7(a text, b text)
  LANGUAGE SQL
-@@ -188,28 +265,47 @@
+@@ -188,28 +270,47 @@
  SELECT a = b;
  $$;
  CALL ptest7(least('a', 'b'), 'a');
@@ -356,7 +361,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
  -- OUT parameters
  CREATE PROCEDURE ptest9(OUT a int)
  LANGUAGE SQL
-@@ -226,17 +322,10 @@
+@@ -226,17 +327,10 @@
 
  -- you can write an expression, but it's not evaluated
  CALL ptest9(1/0);  -- no error
@@ -376,7 +381,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_procedure.
  -- check named-parameter matching
  CREATE PROCEDURE ptest10(OUT a int, IN b int, IN c int)
  LANGUAGE SQL AS $$ SELECT b - c $$;
-@@ -247,137 +336,222 @@
+@@ -247,137 +341,222 @@
  (1 row)
 
  CALL ptest10(a => null, b => 8, c => 2);