From ec7ed8eb1745e470872f69d04437d82045408d42 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Tue, 27 Jun 2023 11:16:50 -0500 Subject: [PATCH 1/2] Add command output in test util function Signed-off-by: Matt Lord --- test/endtoend/utils.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/endtoend/utils.sh b/test/endtoend/utils.sh index 3987289be..2f4d45be7 100644 --- a/test/endtoend/utils.sh +++ b/test/endtoend/utils.sh @@ -225,7 +225,8 @@ function waitForKeyspaceToBeServing() { echo "Shard $ks/$shard is serving" return fi - echo "Shard $ks/$shard is not fully serving, retrying (attempt #$i) ..." + echo "Shard $ks/$shard is not fully serving. Output: $out" + echo "Retrying (attempt #$i) ..." sleep 10 done } From 99312cc2e18f2ac6af101055c07583c6e3140c80 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Tue, 27 Jun 2023 14:38:38 -0500 Subject: [PATCH 2/2] Sync important changes to 101 yaml from upstream Signed-off-by: Matt Lord --- test/endtoend/operator/101_initial_cluster.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/test/endtoend/operator/101_initial_cluster.yaml b/test/endtoend/operator/101_initial_cluster.yaml index 1c3dd14f3..2c842f282 100644 --- a/test/endtoend/operator/101_initial_cluster.yaml +++ b/test/endtoend/operator/101_initial_cluster.yaml @@ -185,6 +185,7 @@ stringData: GRANT REPLICATION SLAVE ON *.* TO 'vt_repl'@'%'; # User for Vitess filtered replication (binlog player). + # Same permissions as vt_app. CREATE USER 'vt_filtered'@'localhost'; GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, @@ -192,18 +193,13 @@ stringData: SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'vt_filtered'@'localhost'; - # User for Orchestrator (https://github.com/openark/orchestrator). - # TODO: Reenable when the password is randomly generated. - #CREATE USER 'orc_client_user'@'%' IDENTIFIED BY 'orc_client_user_password'; - #GRANT SUPER, PROCESS, REPLICATION SLAVE, RELOAD - # ON *.* TO 'orc_client_user'@'%'; - #GRANT SELECT - # ON _vt.* TO 'orc_client_user'@'%'; - FLUSH PRIVILEGES; RESET SLAVE ALL; RESET MASTER; + # custom sql is used to add custom scripts like creating users/passwords. We use it in our tests + # {{custom_sql}} + # We need to set super_read_only back to what it was before - SET GLOBAL super_read_only=IFNULL(@original_super_read_only, 'ON'); \ No newline at end of file + SET GLOBAL super_read_only=IFNULL(@original_super_read_only, 'ON');