Added missing session close in several AdminAPI tests

Author: miguelaraujo

unittest/scripts/js_devapi/scripts/dba_check_instance_configuration_session.js

@@ -23,6 +23,8 @@ session.runSql("SET sql_log_bin = 0");
 session.runSql("DROP user 'test_user'@'%'");
 session.runSql("SET sql_log_bin = 1");
 
+session.close();
+
 // Remove the sandbox
 if (deployed_here)
 	cleanup_sandbox(__mysql_sandbox_port1);

unittest/scripts/js_devapi/scripts/dba_cluster_misconfigurations.js

@@ -68,6 +68,8 @@ var cluster = dba.createCluster('dev');
 // Regression for BUG#25974689 : CHECKS ARE MORE STRICT THAN GROUP REPLICATION
 cluster.dissolve({force: true});
 
+session.close();
+
 //@ Finalization
 // Will delete the sandboxes ONLY if this test was executed standalone
 if (deployed_here)

unittest/scripts/js_devapi/scripts/dba_cluster_misconfigurations_interactive.js

@@ -19,6 +19,8 @@ if (__have_ssl)
 else
   var cluster = dba.createCluster('dev');
 
+session.close();
+
 //@ Finalization
 // Will delete the sandboxes ONLY if this test was executed standalone
 if (deployed_here)

unittest/scripts/js_devapi/scripts/dba_cluster_no_misconfigurations.js

@@ -35,6 +35,8 @@ if (__have_ssl) {
   session.runSql("SET @@global.require_secure_transport = '" + req_sec_trans + "'");
 }
 
+session.close();
+
 //@ Finalization
 // Will delete the sandboxes ONLY if this test was executed standalone
 if (deployed_here)

unittest/scripts/js_devapi/scripts/dba_cluster_no_misconfigurations_interactive.js

@@ -11,6 +11,8 @@ if (__have_ssl)
 else
   var cluster = dba.createCluster('dev');
 
+session.close();
+
 //@ Finalization
 // Will delete the sandboxes ONLY if this test was executed standalone
 if (deployed_here)

unittest/scripts/js_devapi/scripts/dba_cluster_rejoin_instance.js

@@ -9,6 +9,7 @@ session.runSql('DROP USER IF EXISTS \'foo\'@\'%\'');
 session.runSql('CREATE USER \'foo\'@\'%\' IDENTIFIED BY \'bar\'');
 session.runSql('GRANT ALL PRIVILEGES ON *.* TO \'foo\'@\'%\' WITH GRANT OPTION');
 session.runSql('SET sql_log_bin=1');
+session.close();
 
 // Create a new administrative account on instance 2
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port2, 'user': 'root', password: 'root'});
@@ -17,6 +18,7 @@ session.runSql('DROP USER IF EXISTS \'foo\'@\'%\'');
 session.runSql('CREATE USER \'foo\'@\'%\' IDENTIFIED BY \'bar\'');
 session.runSql('GRANT ALL PRIVILEGES ON *.* TO \'foo\'@\'%\' WITH GRANT OPTION');
 session.runSql('SET sql_log_bin=1');
+session.close();
 
 // Create a new administrative account on instance 3
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port3, 'user': 'root', password: 'root'});
@@ -25,6 +27,7 @@ session.runSql('DROP USER IF EXISTS \'foo\'@\'%\'');
 session.runSql('CREATE USER \'foo\'@\'%\' IDENTIFIED BY \'bar\'');
 session.runSql('GRANT ALL PRIVILEGES ON *.* TO \'foo\'@\'%\' WITH GRANT OPTION');
 session.runSql('SET sql_log_bin=1');
+session.close();
 
 //@ Connect to instance 1
 shell.connect({host: localhost, port: __mysql_sandbox_port1, user: 'foo', password: 'bar'});
@@ -93,6 +96,7 @@ session.runSql('DROP USER IF EXISTS \'foo\'@\'%\'');
 session.runSql('SET GLOBAL super_read_only = @sro');
 session.runSql('SET GLOBAL read_only = @ro');
 session.runSql('SET sql_log_bin=1');
+session.close();
 
 // Delete the account on instance 2
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port2, 'user': 'root', password: 'root'});
@@ -104,6 +108,7 @@ session.runSql('DROP USER IF EXISTS \'foo\'@\'%\'');
 session.runSql('SET GLOBAL super_read_only = @sro');
 session.runSql('SET GLOBAL read_only = @ro');
 session.runSql('SET sql_log_bin=1');
+session.close();
 
 // Delete the account on instance 3
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port3, 'user': 'root', password: 'root'});
@@ -115,7 +120,6 @@ session.runSql('DROP USER IF EXISTS \'foo\'@\'%\'');
 session.runSql('SET GLOBAL super_read_only = @sro');
 session.runSql('SET GLOBAL read_only = @ro');
 session.runSql('SET sql_log_bin=1');
-
 session.close();
 
 //@ Finalization

unittest/scripts/js_devapi/scripts/dba_configure_local_instance.js

@@ -15,6 +15,7 @@ dba.configureLocalInstance("gr_user@localhost:"+__mysql_sandbox_port1, {mycnfPat
 session.runSql("SET sql_log_bin = 0");
 session.runSql("GRANT SELECT on *.* TO 'gr_user'@'%'");
 session.runSql("SET sql_log_bin = 1");
+session.close();
 
 //@ create cluster using cluster admin account (BUG#26523629)
 shell.connect({host: localhost, port: __mysql_sandbox_port1, user: 'gr_user', password: 'root'});
@@ -74,3 +75,4 @@ wait_slave_state(cluster, 'third_sandbox', "ONLINE");
 //@<OUT> Check saved auto_inc settings are restored
 shell.connect({scheme: 'mysql', host: localhost, port: __mysql_sandbox_port3, user: 'root', password: 'root'});
 session.runSql("show global variables like 'auto_increment_%'").fetchAll();
+session.close();

unittest/scripts/js_devapi/scripts/dba_drop_metadata_no_interactive.js

@@ -27,6 +27,8 @@ dba.dropMetadataSchema({force:true});
 
 ensure_schema_does_not_exist(session, 'mysql_innodb_cluster_metadata')
 
+session.close();
+
 // Smart deployment cleanup
 if (deployed_here)
   cleanup_sandbox(__mysql_sandbox_port1);

unittest/scripts/js_devapi/scripts/dba_interactive.js

@@ -99,6 +99,8 @@ dba.configureLocalInstance('someotherhost:' + __mysql_sandbox_port1);
 //@<OUT> Dba: configureLocalInstance error 3
 dba.configureLocalInstance('localhost:' + __mysql_sandbox_port1);
 
+session.close();
+
 //@ Dba: Create user without all necessary privileges
 // create user that has all permissions to admin a cluster but doesn't have
 // the grant privileges for them, so it cannot be used to create viable accounts

unittest/scripts/js_devapi/scripts/dba_super_read_only_handling.js

@@ -94,5 +94,7 @@ var cluster = dba.rebootClusterFromCompleteOutage("sample");
 wait_slave_state(cluster, uri2, "ONLINE");
 wait_slave_state(cluster, uri3, "ONLINE");
 
+session.close();
+
 if (deployed_here)
   cleanup_sandboxes(true);

unittest/scripts/py_devapi/scripts/dba_cluster_misconfigurations.py

@@ -68,6 +68,8 @@
 # Regression for BUG#25974689 : CHECKS ARE MORE STRICT THAN GROUP REPLICATION
 cluster.dissolve({"force": True})
 
+session.close()
+
 #@ Finalization
 # Will delete the sandboxes ONLY if this test was executed standalone
 if (deployed_here):

unittest/scripts/py_devapi/scripts/dba_cluster_misconfigurations_interactive.py

@@ -19,6 +19,8 @@
 else:
   cluster = dba.create_cluster('dev')
 
+session.close()
+
 #@ Finalization
 # Will delete the sandboxes ONLY if this test was executed standalone
 if (deployed_here):

unittest/scripts/py_devapi/scripts/dba_cluster_no_misconfigurations.py

@@ -10,6 +10,8 @@
 else:
   cluster = dba.create_cluster('dev')
 
+session.close()
+
 #@ Finalization
 # Will delete the sandboxes ONLY if this test was executed standalone
 if (deployed_here):

unittest/scripts/py_devapi/scripts/dba_cluster_no_misconfigurations_interactive.py

@@ -11,6 +11,8 @@
 else:
   cluster = dba.create_cluster('dev')
 
+session.close()
+
 #@ Finalization
 # Will delete the sandboxes ONLY if this test was executed standalone
 if (deployed_here):

unittest/scripts/py_devapi/scripts/dba_cluster_rejoin_instance.py

@@ -9,6 +9,7 @@
 session.run_sql('CREATE USER \'foo\'@\'%\' IDENTIFIED BY \'bar\'')
 session.run_sql('GRANT ALL PRIVILEGES ON *.* TO \'foo\'@\'%\' WITH GRANT OPTION')
 session.run_sql('SET sql_log_bin=1')
+session.close()
 
 # Create a new administrative account on instance 2
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port2, 'user': 'root', 'password': 'root'})
@@ -17,6 +18,7 @@
 session.run_sql('CREATE USER \'foo\'@\'%\' IDENTIFIED BY \'bar\'')
 session.run_sql('GRANT ALL PRIVILEGES ON *.* TO \'foo\'@\'%\' WITH GRANT OPTION')
 session.run_sql('SET sql_log_bin=1')
+session.close()
 
 # Create a new administrative account on instance 3
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port3, 'user': 'root', 'password': 'root'})
@@ -25,6 +27,7 @@
 session.run_sql('CREATE USER \'foo\'@\'%\' IDENTIFIED BY \'bar\'')
 session.run_sql('GRANT ALL PRIVILEGES ON *.* TO \'foo\'@\'%\' WITH GRANT OPTION')
 session.run_sql('SET sql_log_bin=1')
+session.close()
 
 #@ Connect to instance 1
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port1, 'user': 'foo', 'password': 'bar'})
@@ -91,6 +94,7 @@
 session.run_sql('SET GLOBAL super_read_only = @sro')
 session.run_sql('SET GLOBAL read_only = @ro')
 session.run_sql('SET sql_log_bin=1')
+session.close()
 
 # Delete the account on instance 2
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port2, 'user': 'root', 'password': 'root'})
@@ -102,6 +106,7 @@
 session.run_sql('SET GLOBAL super_read_only = @sro')
 session.run_sql('SET GLOBAL read_only = @ro')
 session.run_sql('SET sql_log_bin=1')
+session.close()
 
 # Delete the account on instance 3
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port3, 'user': 'root', 'password': 'root'})
@@ -113,6 +118,7 @@
 session.run_sql('SET GLOBAL super_read_only = @sro')
 session.run_sql('SET GLOBAL read_only = @ro')
 session.run_sql('SET sql_log_bin=1')
+session.close()
 
 #@ Finalization
 # Will delete the sandboxes ONLY if this test was executed standalone

unittest/scripts/py_devapi/scripts/dba_configure_local_instance.py

@@ -63,7 +63,10 @@
 dba.start_sandbox_instance(__mysql_sandbox_port3, {'sandboxDir': __sandbox_dir})
 wait_slave_state(cluster, 'third_sandbox', "ONLINE")
 
+session.close()
+
 #@ Finalization
 shell.connect({'host': localhost, 'port': __mysql_sandbox_port1, 'user': 'root', 'password': 'root'})
 session.run_sql("DROP USER 'gr_user'@'%'")
 cleanup_sandboxes(deployed_here)
+session.close()

unittest/scripts/py_devapi/scripts/dba_interactive.py

@@ -108,6 +108,8 @@
 #@<OUT> Dba: configure_local_instance error 3
 dba.configure_local_instance('localhost:' + str(__mysql_sandbox_port1));
 
+session.close()
+
 #@ Dba: Create user without all necessary privileges
 # create user that has all permissions to admin a cluster but doesn't have
 # the grant privileges for them, so it cannot be used to create viable accounts

unittest/shell_js_dba_t.cc

@@ -528,6 +528,7 @@ TEST_F(Shell_js_dba_tests, configure_local_instance_errors) {
 #endif
   // Cleans up the used sandbox
   execute("cleanup_sandbox(__mysql_sandbox_port1)");
+  execute("session.close();");
 }