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

MXS-1929: Rename alter service filters

Browse Source 
The command naming caused problems when other parts of the service were
being altered. The parser doesn't seem to handle the case of overlapping
commands that well.

Updated test cases with new code and adjusted syntax accordingly.
This commit is contained in:
Markus Mäkelä
2018-08-08 09:37:39 +03:00
parent c56ef3cc27
commit f3a64f0b56
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxscale-system-test/alter_router.cpp
View File

@ -20,7 +20,7 @@ void alter_readwritesplit(TestConnections& test)
test.maxscales->wait_for_monitor();
first.connect();
test.maxscales->ssh_node_f(0, true, "maxctrl alter service RW-Split-Router master_failure_mode fail_on_write");
test.check_maxctrl("alter service RW-Split-Router master_failure_mode fail_on_write");
second.connect();
// Check that writes work for both connections
@ -75,8 +75,7 @@ void alter_readconnroute(TestConnections& test)
row[0].c_str(), master_id.c_str());
}
int rc = test.maxscales->ssh_node_f(0, true, "maxctrl alter service Read-Connection-Router-Master router_options slave");
test.assert(rc == 0, "Readconnroute alteration should work");
test.check_maxctrl("alter service Read-Connection-Router-Master router_options slave");
for (int i = 0; i < 5; i++)
{
@ -95,8 +94,7 @@ void alter_schemarouter(TestConnections& test)
test.assert(!conn.query("SELECT 1"), "Query before reconfiguration should fail");
conn.disconnect();
int rc = test.maxscales->ssh_node_f(0, true, "maxctrl alter service SchemaRouter ignore_databases_regex '.*'");
test.assert(rc == 0, "Schemarouter alteration should work");
test.check_maxctrl("alter service SchemaRouter ignore_databases_regex '.*'");
conn.connect();
test.assert(conn.query("SELECT 1"), "Query after reconfiguration should work: %s", conn.error());