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

Clean up Galera_nodes::check_galera

Browse Source 
The code can be simplified as only one of the nodes needs to be checked to
see how many nodes are in the cluster.
This commit is contained in:
Markus Mäkelä 2018-11-04 20:50:44 +02:00
parent 69bf3a90d3
commit 4e3d1a29b6
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
maxscale-system-test/mariadb_nodes.cpp
View File

@ -867,7 +867,7 @@ bool Mariadb_nodes::revert_nodes_snapshot()
int Galera_nodes::check_galera()
{
int res1 = 0;
int res = 1;
if (verbose)
{
@ -875,50 +875,26 @@ int Galera_nodes::check_galera()
fflush(stdout);
}
if (this->nodes[0] == NULL)
if (connect() == 0)
{
this->connect();
}
Row r = get_row(nodes[0], "SHOW STATUS WHERE Variable_name='wsrep_cluster_size'");
res1 = get_versions();
for (int i = 0; i < N; i++)
{
MYSQL* conn = open_conn(port[i], IP[i], user_name, password, ssl);
if (conn == NULL || mysql_errno(conn) != 0)
if (r.size() == 2)
{
printf("Error connectiong node %d: %s\n", i, mysql_error(conn));
res1 = 1;
}
else
{
char str[1024] = "";
if (find_field(conn,
(char*) "SHOW STATUS WHERE Variable_name='wsrep_cluster_size';",
(char*) "Value",
str) != 0)
if (r[1] == std::to_string(N))
{
printf("wsrep_cluster_size is not found in SHOW STATUS LIKE 'wsrep%%' results\n");
fflush(stdout);
res1 = 1;
res = 0;
}
else
{
int cluster_size;
sscanf(str, "%d", &cluster_size);
if (cluster_size != N)
{
printf("wsrep_cluster_size is not %d, it is %d\n", N, cluster_size);
fflush(stdout);
res1 = 1;
}
cout << "Expected cluster size: " << N << " Actual size: " << r[1] << endl;
}
}
mysql_close(conn);
}
return res1;
disconnect();
return res;
}
int Mariadb_nodes::set_slave(MYSQL* conn,