AdminAPi test fixes:

Added check_sandbox_has_metadata() in the available test functions to
wait for an instance which was recently added to a cluster to have
the metedata schema before proceeding to any operation which requires
the metadata: there may be some replication delay.

Included the usage check_sandbox_has_metatadata() in
check_sandbox_in_metadata(): in some cases the metadata schema wasn't
present yet in the instance so the checks in the 'instances' table
failed.

Replaced the use of killSandboxInstance() with stopSandboxInstance()
in super_read_only_handling test to make sure the instance is
completely dead before restarting it to make sure the restart does not
fail. Made use of try_restart_sandbox too instead of startSandboxInstance().

Author: miguelaraujo

unittest/scripts/js_devapi/scripts/dba_super_read_only_handling.js

@@ -58,12 +58,12 @@ wait_slave_state(cluster, uri3, "ONLINE");
 // Wait for the third added instance to fetch all the replication data
 wait_sandbox_in_metadata(__mysql_sandbox_port3);
 
-//@<OUT> Rejoins an instance
+// Rejoin instance
 stop_sandbox(__mysql_sandbox_port3);
 wait_slave_state(cluster, uri3, "(MISSING)");
-start_sandbox(__mysql_sandbox_port3);
-
+try_restart_sandbox(__mysql_sandbox_port3);
 ensureSuperReadOnly(connection3);
+//@<OUT> Rejoins an instance
 cluster.rejoinInstance(connection3);
 
 delete cluster;

unittest/scripts/js_devapi/setup/setup.js

@@ -160,6 +160,15 @@ function wait_sandbox(timeout, wait_interval, condition, sandbox_port){
   return res;
 }
 
+function check_sandbox_has_metadata() {
+  var sandbox_has_metadata =
+    session.runSql("SELECT count(*) FROM information_schema.TABLES WHERE (TABLE_SCHEMA = 'mysql_innodb_cluster_metadata') AND (TABLE_NAME = 'instances')").fetchOne()[0];
+
+    println("---> count(*) sandbox has metadata = " + sandbox_has_metadata);
+
+    return sandbox_has_metadata == "1";
+}
+
 function check_sandbox_in_metadata(instance_port) {
   var sandbox_count_metadata =
     session.runSql("select count(*) from mysql_innodb_cluster_metadata.instances where instance_name = 'localhost:" + instance_port + "'").fetchOne()[0];
@@ -172,6 +181,7 @@ function check_sandbox_in_metadata(instance_port) {
 function wait_sandbox_in_metadata(instance_port) {
   var connected = connect_to_sandbox([instance_port]);
   if (connected) {
+    wait(60, 1, check_sandbox_has_metadata);
     wait_sandbox(60, 1, check_sandbox_in_metadata, instance_port);
     session.close();
   }