Clean up binlog_semisync

Removed unnecessary newlines and for loops that were executed only once.
This commit is contained in:
Markus Mäkelä
2017-09-21 22:43:07 +03:00
parent ba47d80efa
commit 54f4c6ff73
2 changed files with 121 additions and 140 deletions

View File

@ -15,73 +15,60 @@ int main(int argc, char *argv[])
{
TestConnections * Test = new TestConnections(argc, argv);
Test->tprintf("Test object initialized\n");
Test->tprintf("Test object initialized");
Test->set_timeout(3000);
int options_set = 3;
if (Test->smoke)
{
options_set = 1;
}
Test->tprintf("Trying to connect to backend\n");
Test->tprintf("Trying to connect to backend");
if (Test->repl->connect() == 0)
{
Test->tprintf("DROP TABLE t1\n");
Test->tprintf("DROP TABLE t1");
execute_query(Test->repl->nodes[0], (char *) "DROP TABLE IF EXISTS t1;");
//Test->tprintf("SET GLOBAL rpl_semi_sync_master_enabled = 1;\n");
//execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL rpl_semi_sync_master_enabled = 1;");
Test->repl->close_connections();
sleep(5);
Test->binlog_cmd_option = 1;
Test->start_binlog();
Test->repl->connect();
Test->tprintf("install semisync plugin");
execute_query(Test->repl->nodes[0],
(char *) "INSTALL PLUGIN rpl_semi_sync_master SONAME 'semisync_master.so';");
for (int option = 0; option < options_set; option++)
{
Test->binlog_cmd_option = option;
Test->start_binlog();
Test->repl->connect();
Test->tprintf("install semisync plugin\n");
execute_query(Test->repl->nodes[0],
(char *) "INSTALL PLUGIN rpl_semi_sync_master SONAME 'semisync_master.so';");
//sleep(10);
Test->tprintf("Reconnect\n");
Test->repl->close_connections();
Test->repl->connect();
Test->tprintf("SET GLOBAL rpl_semi_sync_master_enabled = 1;\n");
execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL rpl_semi_sync_master_enabled = 1;");
//sleep(10);
Test->repl->close_connections();
test_binlog(Test);
Test->tprintf("Reconnect");
Test->repl->close_connections();
Test->repl->connect();
Test->tprintf("SET GLOBAL rpl_semi_sync_master_enabled = 1;");
execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL rpl_semi_sync_master_enabled = 1;");
Test->repl->close_connections();
test_binlog(Test);
Test->repl->connect();
Test->tprintf("SET GLOBAL rpl_semi_sync_master_enabled = 0;\n");
execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL rpl_semi_sync_master_enabled = 0;");
//sleep(10);
Test->repl->close_connections();
test_binlog(Test);
Test->repl->connect();
Test->tprintf("SET GLOBAL rpl_semi_sync_master_enabled = 0;");
execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL rpl_semi_sync_master_enabled = 0;");
Test->repl->close_connections();
test_binlog(Test);
Test->repl->connect();
Test->tprintf("uninstall semisync plugin\n");
execute_query(Test->repl->nodes[0], (char *) "UNINSTALL PLUGIN rpl_semi_sync_master;");
Test->tprintf("Reconnect\n");
Test->repl->close_connections();
Test->repl->connect();
Test->tprintf("SET GLOBAL rpl_semi_sync_master_enabled = 1;\n");
execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL rpl_semi_sync_master_enabled = 1;");
//sleep(10);
Test->repl->close_connections();
test_binlog(Test);
Test->repl->connect();
Test->tprintf("uninstall semisync plugin");
execute_query(Test->repl->nodes[0], (char *) "UNINSTALL PLUGIN rpl_semi_sync_master;");
Test->tprintf("Reconnect");
Test->repl->close_connections();
Test->repl->connect();
Test->tprintf("SET GLOBAL rpl_semi_sync_master_enabled = 1;");
execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL rpl_semi_sync_master_enabled = 1;");
Test->repl->close_connections();
test_binlog(Test);
Test->repl->connect();
Test->tprintf("SET GLOBAL rpl_semi_sync_master_enabled = 0;\n");
execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL rpl_semi_sync_master_enabled = 0;");
sleep(10);
Test->repl->close_connections();
test_binlog(Test);
}
Test->repl->connect();
Test->tprintf("SET GLOBAL rpl_semi_sync_master_enabled = 0;");
execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL rpl_semi_sync_master_enabled = 0;");
sleep(10);
Test->repl->close_connections();
test_binlog(Test);
}
else
{
Test->add_result(1, "Can't connect to backend\n");
Test->add_result(1, "Can't connect to backend");
}
int rval = Test->global_result;