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

MXS-1703 Support "Preparing" in Slave_IO_Running

Browse Source 
Is interpreted as "Connecting".
This commit is contained in:
Esa Korhonen
2018-05-08 12:39:57 +03:00
parent 13eecfbaa3
commit 370b3be576
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -25,6 +25,7 @@ namespace
{ {
// Used for Slave_IO_Running // Used for Slave_IO_Running
const char YES[] = "Yes"; const char YES[] = "Yes";
const char PREPARING[] = "Preparing";
const char CONNECTING[] = "Connecting"; const char CONNECTING[] = "Connecting";
const char NO[] = "No"; const char NO[] = "No";
} }
@ -659,7 +660,9 @@ SlaveStatus::slave_io_running_t SlaveStatus::slave_io_from_string(const std::str
{ {
rval = SLAVE_IO_YES; rval = SLAVE_IO_YES;
} }
else if (str == CONNECTING) // Interpret "Preparing" as "Connecting". It's not quite clear if the master server id has been read
// or if server versions between master and slave have been checked, so better be on the safe side.
else if (str == CONNECTING || str == PREPARING)
{ {
rval = SLAVE_IO_CONNECTING; rval = SLAVE_IO_CONNECTING;
} }