Merge branch '2.3' into 2.4

2020-07-24 08:01:53 +03:00
parent d99d2f21a6 aaec73a8c8
commit 5c76d3d906
3 changed files with 24 additions and 10 deletions
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
@ -553,9 +553,19 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
            }
            else
            {
-                MXS_ERROR("Failed to execute session command in %s (%s)",
-                          backend->name(),
-                          backend->uri());
+                backend->close();
+
+                if (m_config.master_failure_mode == RW_FAIL_INSTANTLY && backend == m_current_master)
+                {
+                    MXS_ERROR("Failed to execute session command in Master: %s (%s)",
+                              backend->name(), backend->uri());
+                    return false;
+                }
+                else
+                {
+                    MXS_ERROR("Failed to execute session command in %s (%s)",
+                              backend->name(), backend->uri());
+                }
            }
        }
    }