From 370b3be576ed16f1b428d8219cffc79f0f19f9fc Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Tue, 8 May 2018 12:39:57 +0300 Subject: [PATCH] MXS-1703 Support "Preparing" in Slave_IO_Running Is interpreted as "Connecting". --- server/modules/monitor/mariadbmon/mariadbserver.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/modules/monitor/mariadbmon/mariadbserver.cc b/server/modules/monitor/mariadbmon/mariadbserver.cc index 84fc1f419..098a5db32 100644 --- a/server/modules/monitor/mariadbmon/mariadbserver.cc +++ b/server/modules/monitor/mariadbmon/mariadbserver.cc @@ -25,6 +25,7 @@ namespace { // Used for Slave_IO_Running const char YES[] = "Yes"; + const char PREPARING[] = "Preparing"; const char CONNECTING[] = "Connecting"; 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; } - 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; }