Merge pull request bitpoke#438 from planetscale/2.10-merge

Forward port changes made while doing 2.10 release

test/endtoend/operator/101_initial_cluster.yaml

@@ -185,25 +185,21 @@ 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,
       LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW,
       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');
+    SET GLOBAL super_read_only=IFNULL(@original_super_read_only, 'ON');

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
 }