From 21ad6fba2a1e64b87d403df021b7dfe2676837f0 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Fri, 24 Apr 2015 05:55:06 +0300
Subject: [PATCH] Added option to disable slave recovery in readwritesplit.

---
 server/modules/include/readwritesplit.h       |  1 +
 .../routing/readwritesplit/readwritesplit.c   | 29 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/server/modules/include/readwritesplit.h b/server/modules/include/readwritesplit.h
index 7c94a9b13..9aa55016f 100644
--- a/server/modules/include/readwritesplit.h
+++ b/server/modules/include/readwritesplit.h
@@ -251,6 +251,7 @@ typedef struct rwsplit_config_st {
 	target_t          rw_use_sql_variables_in;
         int               rw_max_sescmd_history_size;
         bool disable_sescmd_hist;
+        bool disable_slave_recovery;
 } rwsplit_config_t;
      
 
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index b424a6376..b36b02753 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -2789,16 +2789,16 @@ static void clientReply (
 			bool rconn = false;
                         writebuf = sescmd_cursor_process_replies(writebuf, bref, &rconn);
 
-			if(rconn)
+			if(rconn && !router_inst->rwsplit_config.disable_slave_recovery)
 			{
-			   select_connect_backend_servers(&router_cli_ses->rses_master_ref,
-						    router_cli_ses->rses_backend_ref,
-						    router_cli_ses->rses_nbackends,
-						    router_cli_ses->rses_config.rw_max_slave_conn_count,
-						    router_cli_ses->rses_config.rw_max_slave_replication_lag,
-						    router_cli_ses->rses_config.rw_slave_select_criteria,
-						    router_cli_ses->rses_master_ref->bref_dcb->session,
-						    router_cli_ses->router);
+			    select_connect_backend_servers(&router_cli_ses->rses_master_ref,
+						     router_cli_ses->rses_backend_ref,
+						     router_cli_ses->rses_nbackends,
+						     router_cli_ses->rses_config.rw_max_slave_conn_count,
+						     router_cli_ses->rses_config.rw_max_slave_replication_lag,
+						     router_cli_ses->rses_config.rw_slave_select_criteria,
+						     router_cli_ses->rses_master_ref->bref_dcb->session,
+						     router_cli_ses->router);
 			}
                 }
                 /** 
@@ -4588,6 +4588,10 @@ static void rwsplit_process_router_options(
 			{
 			    router->rwsplit_config.disable_sescmd_hist = config_truth_value(value);
 			}
+			else if(strcmp(options[i],"disable_slave_recovery") == 0)
+			{
+			    router->rwsplit_config.disable_slave_recovery = config_truth_value(value);
+			}
                 }
         } /*< for */
 }
@@ -4830,6 +4834,12 @@ static bool handle_error_new_connection(
 	 * Try to get replacement slave or at least the minimum 
 	 * number of slave connections for router session.
 	 */
+	if(inst->rwsplit_config.disable_slave_recovery)
+	{
+	    succp = have_enough_servers(&rses,1,router_nservers,inst) ? true : false;
+	}
+	else
+	{
 	succp = select_connect_backend_servers(
 			&rses->rses_master_ref,
 			rses->rses_backend_ref,
@@ -4839,6 +4849,7 @@ static bool handle_error_new_connection(
 			rses->rses_config.rw_slave_select_criteria,
 			ses,
 			inst);
+	}
 	
 return_succp:
 	return succp;