From 113b1503f65fee13c1f0e1e9bbc62946ca40bb6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 5 Nov 2018 09:31:41 +0200 Subject: [PATCH] Expand readwritesplit delayed retry error message The error now explains if the write failure was due to the delayed_retry_timeout being reached. --- server/modules/routing/readwritesplit/rwsplit_route_stmt.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc index e466581ca..f63130324 100644 --- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc +++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc @@ -842,7 +842,11 @@ void RWSplitSession::log_master_routing_failure(bool found, || curr_master->dcb()->dcb_role == DCB_ROLE_BACKEND_HANDLER); char errmsg[MAX_SERVER_ADDRESS_LEN * 2 + 100]; // Extra space for error message - if (!found) + if (m_config.delayed_retry && m_retry_duration >= m_config.delayed_retry_timeout) + { + sprintf(errmsg, "'delayed_retry_timeout' exceeded before a master could be found"); + } + else if (!found) { sprintf(errmsg, "Could not find a valid master connection"); }