Merge commit '262f1d7e471bacca6b985ec3f2cd5cb76d6e2584' into 2.3

2018-10-26 12:44:57 +03:00
parent c45059f83d 262f1d7e47
commit 4d8a95d041
5 changed files with 47 additions and 9 deletions
--- a/server/modules/routing/readwritesplit/rwsplitsession.cc
+++ b/server/modules/routing/readwritesplit/rwsplitsession.cc
@ -987,14 +987,21 @@ bool RWSplitSession::handle_error_new_connection(DCB* backend_dcb, GWBUF* errmsg
        route_stored_query();
    }

-    bool succp;
+    bool succp = false;
    /**
     * Try to get replacement slave or at least the minimum
     * number of slave connections for router session.
     */
    if (m_recv_sescmd > 0 && m_config.disable_sescmd_history)
    {
-        succp = m_router->have_enough_servers();
+        for (const auto& a : m_backends)
+        {
+            if (a->in_use())
+            {
+                succp = true;
+                break;
+            }
+        }
    }
    else
    {