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

Don't force verbose output

Browse Source 
The tests shouldn't force verbose output.
This commit is contained in:
Markus Mäkelä 2017-12-19 09:23:44 +02:00
parent 3e398004e8
commit 4451355e47
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -633,13 +633,13 @@ bool Mariadb_nodes::check_master_node(MYSQL *conn)
} }
/** /**
* @brief bad_slave_thread_status Check if filed in the slave status outpur is not 'yes' * @brief bad_slave_thread_status Check if field in the slave status outpur is not 'yes'
* @param conn MYSQL struct (connection have to be open) * @param conn MYSQL struct (connection have to be open)
* @param field Filed to check * @param field Field to check
* @param node Node index * @param node Node index
* @return false if requested filed is 'Yes' * @return false if requested field is 'Yes'
*/ */
static bool bad_slave_thread_status(MYSQL *conn, const char *field, int node) bool Mariadb_nodes::bad_slave_thread_status(MYSQL *conn, const char *field, int node)
{ {
char str[1024] = ""; char str[1024] = "";
bool rval = false; bool rval = false;
@ -650,23 +650,29 @@ static bool bad_slave_thread_status(MYSQL *conn, const char *field, int node)
if (find_field(conn, "SHOW SLAVE STATUS;", field, str) != 0) if (find_field(conn, "SHOW SLAVE STATUS;", field, str) != 0)
{ {
printf("Node %d: %s not found in SHOW SLAVE STATUS\n", node, field); printf("Node %d: %s not found in SHOW SLAVE STATUS\n", node, field);
fflush(stdout);
break; break;
} }
else if (strcmp(str, "Yes") == 0 || strcmp(str, "No") == 0)
if (verbose)
{
printf("Node %d: field %s is %s\n", node, field, str);
}
if (strcmp(str, "Yes") == 0 || strcmp(str, "No") == 0)
{ {
printf("Node %d: filed %s is %s\n", node, field, str);
break; break;
} }
printf("Node %d: filed %s is %s\n", node, field, str);
/** Any other state is transient and we should try again */ /** Any other state is transient and we should try again */
sleep(1); sleep(1);
} }
if (strcmp(str, "Yes") != 0) if (strcmp(str, "Yes") != 0)
{ {
printf("Node %d: %s is '%s'\n", node, field, str); if (verbose)
fflush(stdout); {
printf("Node %d: %s is '%s'\n", node, field, str);
}
rval = true; rval = true;
} }
@ -760,7 +766,6 @@ int Mariadb_nodes::check_replication()
bool Mariadb_nodes::fix_replication() bool Mariadb_nodes::fix_replication()
{ {
verbose = true;
if (check_replication()) if (check_replication())
{ {
unblock_all_nodes(); unblock_all_nodes();

1
maxscale-system-test/mariadb_nodes.h
View File

@ -415,6 +415,7 @@ public:
private: private:
bool check_master_node(MYSQL *conn); bool check_master_node(MYSQL *conn);
bool bad_slave_thread_status(MYSQL *conn, const char *field, int node);
}; };
class Galera_nodes : public Mariadb_nodes class Galera_nodes : public Mariadb_nodes