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

Replace check_log_err with log_includes/log_excludes

Browse Source 
The latter are more explicit and easier to understand at the call site.

Also removed the redundant crash checks via the log files.
This commit is contained in:
Markus Mäkelä
2018-11-16 12:32:19 +02:00
parent bc8db6d52c
commit 4b6aab1417
38 changed files with 61 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
maxscale-system-test/keepalived_masterdown.cpp
View File

@ -69,10 +69,10 @@ int main(int argc, char* argv[])
char str[1024];
sprintf(str, "Performing automatic failover to replace failed master 'server%d'", first_master + 1);
test.tprintf("Checking Maxscale log on 000 for the failover message %s\n", str);
test.check_log_err(0, str, true);
test.log_includes(0, str);
sprintf(str, "Performing automatic failover to replace failed master");
test.tprintf("Checking Maxscale log on 001 for the lack of failover message\n");
test.check_log_err(1, str, false);
test.log_excludes(1, str);
if (test.global_result != 0)
{
return test.global_result;
@ -100,11 +100,11 @@ int main(int argc, char* argv[])
sprintf(str, "Performing automatic failover to replace failed master 'server%d'", second_master + 1);
test.tprintf("Checking Maxscale log on 001 for the failover message %s\n", str);
test.check_log_err(1, str, true);
test.log_includes(1, str);
test.check_log_err(1, (char*) "Multiple failed master servers detected", false);
test.check_log_err(1, (char*) "Failed to perform failover", false);
test.check_log_err(1, (char*) "disabling automatic failover", false);
test.log_excludes(1, "Multiple failed master servers detected");
test.log_excludes(1, "Failed to perform failover");
test.log_excludes(1, "disabling automatic failover");
if (test.global_result != 0)
{
return test.global_result;
@ -123,17 +123,17 @@ int main(int argc, char* argv[])
sprintf(str, "Performing automatic failover to replace failed master 'server%d'", second_master + 1);
test.tprintf("Checking Maxscale log on 001 for the failover message %s\n", str);
test.check_log_err(1, str, true);
test.log_includes(1, str);
test.tprintf("Checking Maxscale log on 000 for the lack of failover message %s\n", str);
test.check_log_err(0, str, false);
test.log_excludes(0, str);
test.check_log_err(1, (char*) "Multiple failed master servers detected", false);
test.check_log_err(1, (char*) "Failed to perform failover", false);
test.check_log_err(1, (char*) "disabling automatic failover", false);
test.log_excludes(1, "Multiple failed master servers detected");
test.log_excludes(1, "Failed to perform failover");
test.log_excludes(1, "disabling automatic failover");
test.check_log_err(0, (char*) "Multiple failed master servers detected", false);
test.check_log_err(0, (char*) "Failed to perform failover", false);
test.check_log_err(0, (char*) "disabling automatic failover", false);
test.log_excludes(0, "Multiple failed master servers detected");
test.log_excludes(0, "Failed to perform failover");
test.log_excludes(0, "disabling automatic failover");
stop_keepalived(&test);
return test.global_result;