hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format all files

Browse Source 
Formatted all files with uncrustify.
This commit is contained in:
Markus Mäkelä
2018-10-29 14:06:58 +02:00
parent 8d1b26060a
commit 906d8cee5b
9 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
maxscale-system-test/mm.cpp
View File

@ -43,7 +43,7 @@ int check_conf(TestConnections& test, int blocked_node)
for (int i = 0; i < 2; i++)
{
if ( i != blocked_node)
if (i != blocked_node)
{
test.tprintf("Checking data from node %d (%s)\n", i, test.repl->IP[i]);
test.set_timeout(100);
@ -63,7 +63,7 @@ int check_conf(TestConnections& test, int blocked_node)
return global_result;
}
int main(int argc, char *argv[])
int main(int argc, char* argv[])
{
TestConnections test(argc, argv);
@ -72,19 +72,19 @@ int main(int argc, char *argv[])
test.repl->set_repl_user();
test.start_mm(0); // first node - slave, second - master
test.start_mm(0); // first node - slave, second - master
test.set_timeout(120);
test.maxscales->get_maxadmin_param(0, (char *) "show server server1", (char *) "Status:", maxadmin_result);
test.maxscales->get_maxadmin_param(0, (char*) "show server server1", (char*) "Status:", maxadmin_result);
test.tprintf("node0 %s\n", maxadmin_result);
if (strstr(maxadmin_result, "Slave, Running") == NULL )
if (strstr(maxadmin_result, "Slave, Running") == NULL)
{
test.add_result(1, "Node0 is not slave, status is %s\n", maxadmin_result);
}
test.set_timeout(120);
test.maxscales->get_maxadmin_param(0, (char *) "show server server2", (char *) "Status:", maxadmin_result);
test.maxscales->get_maxadmin_param(0, (char*) "show server server2", (char*) "Status:", maxadmin_result);
test.tprintf("node1 %s\n", maxadmin_result);
if (strstr(maxadmin_result, "Master, Running") == NULL )
if (strstr(maxadmin_result, "Master, Running") == NULL)
{
test.add_result(1, "Node1 is not master, status is %s\n", maxadmin_result);
}
@ -97,9 +97,9 @@ int main(int argc, char *argv[])
test.stop_timeout();
test.maxscales->wait_for_monitor();
test.set_timeout(120);
test.maxscales->get_maxadmin_param(0, (char *) "show server server1", (char *) "Status:", maxadmin_result);
test.maxscales->get_maxadmin_param(0, (char*) "show server server1", (char*) "Status:", maxadmin_result);
printf("node0 %s\n", maxadmin_result);
if (strstr(maxadmin_result, "Down") == NULL )
if (strstr(maxadmin_result, "Down") == NULL)
{
test.add_result(1, "Node0 is not down, status is %s\n", maxadmin_result);
}
@ -116,9 +116,9 @@ int main(int argc, char *argv[])
test.tprintf("Block master\n");
test.repl->block_node(1);
test.maxscales->wait_for_monitor();
test.maxscales->get_maxadmin_param(0, (char *) "show server server2", (char *) "Status:", maxadmin_result);
test.maxscales->get_maxadmin_param(0, (char*) "show server server2", (char*) "Status:", maxadmin_result);
printf("node1 %s\n", maxadmin_result);
if (strstr(maxadmin_result, "Down") == NULL )
if (strstr(maxadmin_result, "Down") == NULL)
{
test.add_result(1, "Node1 is not down, status is %s\n", maxadmin_result);
}
@ -126,7 +126,7 @@ int main(int argc, char *argv[])
test.set_timeout(120);
test.repl->connect();
execute_query(test.repl->nodes[0], (char *) "SET GLOBAL READ_ONLY=OFF");
execute_query(test.repl->nodes[0], (char*) "SET GLOBAL READ_ONLY=OFF");
test.repl->close_connections();
test.maxscales->wait_for_monitor();
@ -141,7 +141,7 @@ int main(int argc, char *argv[])
test.set_timeout(120);
printf("Make node 2 slave\n");
test.repl->connect();
execute_query(test.repl->nodes[1], (char *) "SET GLOBAL READ_ONLY=ON");
execute_query(test.repl->nodes[1], (char*) "SET GLOBAL READ_ONLY=ON");
test.repl->close_connections();
test.maxscales->wait_for_monitor();
@ -150,16 +150,16 @@ int main(int argc, char *argv[])
test.add_result(check_conf(test, 2), "Configuration broken\n");
test.set_timeout(60);
test.maxscales->get_maxadmin_param(0, (char *) "show server server2", (char *) "Status:", maxadmin_result);
test.maxscales->get_maxadmin_param(0, (char*) "show server server2", (char*) "Status:", maxadmin_result);
printf("node1 %s\n", maxadmin_result);
if (strstr(maxadmin_result, "Slave, Running") == NULL )
if (strstr(maxadmin_result, "Slave, Running") == NULL)
{
test.add_result(1, "Node1 is not slave, status is %s\n", maxadmin_result);
}
test.set_timeout(60);
test.maxscales->get_maxadmin_param(0, (char *) "show server server1", (char *) "Status:", maxadmin_result);
test.maxscales->get_maxadmin_param(0, (char*) "show server server1", (char*) "Status:", maxadmin_result);
test.tprintf("node0 %s\n", maxadmin_result);
if (strstr(maxadmin_result, "Master, Running") == NULL )
if (strstr(maxadmin_result, "Master, Running") == NULL)
{
test.add_result(1, "Node0 is not master, status is %s\n", maxadmin_result);
}