Merge branch 'develop' into schemarouter_refresh

CMakeLists.txt

@@ -114,7 +114,13 @@ if(PROFILE)
   set(FLAGS "${FLAGS} -pg " CACHE STRING "Compilation flags" FORCE)
 endif()
 
+if(USE_C99)
+  message(STATUS "Using C99 standard")
+  set(CMAKE_C_FLAGS "-std=c99 -D_GNU_SOURCE=1 ${FLAGS}")
+else()
   set(CMAKE_C_FLAGS "${FLAGS}")
+endif()
+
 set(CMAKE_C_FLAGS_DEBUG "${DEBUG_FLAGS} -DSS_DEBUG -DLOG_ASSERT")
 set(CMAKE_C_FLAGS_RELEASE "")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-ggdb")

Documentation/routers/ReadWriteSplit.md

@@ -93,6 +93,13 @@ disable_sescmd_history=true
 disable_slave_recovery=true
 ```
 
+**`master_accept_reads`** allows the master server to be used for reads. This is a useful option to enable if you are using a small number of servers and wish to use the master for reads as well.
+
+```
+# Use the master for reads
+master_accept_reads=true
+```
+
 ## Limitations
 
 In Master-Slave replication cluster also read-only queries are routed to master too in the following situations:

cmake/macros.cmake

@@ -20,6 +20,9 @@ endmacro()
 
 macro(set_variables)
 
+  # Use C99
+  set(USE_C99 FALSE CACHE BOOL "Use C99 standard")
+
   # hostname or IP address of MaxScale's host
   set(TEST_HOST "127.0.0.1" CACHE STRING "hostname or IP address of MaxScale's host")
 

etc/postrm.in

@@ -3,7 +3,9 @@ if [ "$1" -eq 0 ]
 then
     rm -f /etc/init.d/maxscale
     rm -f /etc/ld.so.conf.d/maxscale.conf
+    rm -f /usr/lib/systemd/system/maxscale.service
 else
+    # Copy and rename config from old location
     if [ -f "/usr/local/mariadb-maxscale/etc/MaxScale.cnf" ]
     then
         cp "/usr/local/mariadb-maxscale/etc/MaxScale.cnf" "/etc/maxscale.cnf"

server/core/dbusers.c

@@ -1842,18 +1842,6 @@ char *mysql_format_user_entry(void *data)
         return mysql_user;
 }
 
-/*
- * The hash function we use for storing MySQL database names.
- *
- * @param key	The key value
- * @return	The hash key
- */
-int
-resource_hash(char *key)
-{
-        return (*key + *(key + 1));
-}
-
 /**
  * Remove the resources table
  *
@@ -1877,7 +1865,7 @@ resource_alloc()
 {
 HASHTABLE       *resources;
 
-        if ((resources = hashtable_alloc(10, resource_hash, strcmp)) == NULL)
+        if ((resources = hashtable_alloc(10, simple_str_hash, strcmp)) == NULL)
         {
                 return NULL;
         }

server/core/gateway.c

@@ -1531,17 +1531,13 @@ int main(int argc, char **argv)
 		/** Use default log directory /var/log/maxscale/ */
 		if(logdir == NULL)
 		{
-
+                    if(mkdir(default_logdir,0777) != 0 && errno != EEXIST)
-		    if(access(default_logdir,F_OK) != 0)
-		    {
-			if(mkdir(logdir,0555) != 0)
                     {
                         fprintf(stderr,
                          "Error: Cannot create log directory: %s\n",
                          default_logdir);
                         goto return_main;
                     }
-		    }
 		    logdir = strdup(default_logdir);
 		}
 
@@ -1598,7 +1594,7 @@ int main(int argc, char **argv)
 	/**
          * Set a data directory for the mysqld library, we use
          * a unique directory name to avoid clauses if multiple
-         * instances of the gateway are beign run on the same
+         * instances of the gateway are being run on the same
          * machine.
          */
 

server/core/monitor.c

@@ -192,6 +192,7 @@ monitorAddServer(MONITOR *mon, SERVER *server)
 	db->con = NULL;
 	db->next = NULL;
         db->mon_err_count = 0;
+	db->log_version_err = true;
 	/** Server status is uninitialized */
         db->mon_prev_status = -1;
 	/* pending status is updated by get_replication_tree */

server/include/monitor.h

@@ -124,6 +124,7 @@ typedef enum
 typedef struct monitor_servers {
 	SERVER		*server;	/**< The server being monitored */
 	MYSQL		*con;		/**< The MySQL connection */
+        bool log_version_err;
 	int		mon_err_count;
 	unsigned int	mon_prev_status;
 	unsigned int	pending_status; /**< Pending Status flag bitmap */

server/modules/include/readwritesplit.h

@@ -252,6 +252,7 @@ typedef struct rwsplit_config_st {
         int               rw_max_sescmd_history_size;
         bool disable_sescmd_hist;
         bool disable_slave_recovery;
+        bool master_reads; /*< Use master for reads */
 } rwsplit_config_t;
      
 

server/modules/monitor/galeramon.c

@@ -280,7 +280,7 @@ monitorDatabase(MONITOR *mon, MONITOR_SERVERS *database)
 {
     GALERA_MONITOR* handle = (GALERA_MONITOR*)mon->handle;
 MYSQL_ROW	row;
-MYSQL_RES	*result;
+MYSQL_RES	*result,*result2;
 int		isjoined = 0;
 char		*uname  = mon->user;
 char		*passwd = mon->password;
@@ -372,6 +372,14 @@ char 			*server_string;
 	if (mysql_query(database->con, "SHOW STATUS LIKE 'wsrep_local_state'") == 0
 		&& (result = mysql_store_result(database->con)) != NULL)
 	{
+		if(mysql_field_count(database->con) < 2)
+		{
+		    mysql_free_result(result);
+		    skygw_log_write(LE,"Error: Unexpected result for \"SHOW STATUS LIKE 'wsrep_local_state'\". Expected 2 columns."
+				    " MySQL Version: %s",version_str);
+		    return;
+		}
+
 		while ((row = mysql_fetch_row(result)))
 		{
 			if (strcmp(row[1], "4") == 0) 
@@ -380,13 +388,22 @@ char 			*server_string;
 			/* Check if the node is a donor and is using xtrabackup, in this case it can stay alive */
 			else if (strcmp(row[1], "2") == 0 && handle->availableWhenDonor == 1) {
 				if (mysql_query(database->con, "SHOW VARIABLES LIKE 'wsrep_sst_method'") == 0
-					&& (result = mysql_store_result(database->con)) != NULL)
+					&& (result2 = mysql_store_result(database->con)) != NULL)
 				{
+				    		if(mysql_field_count(database->con) < 2)
+						{
+						    mysql_free_result(result);
+						    mysql_free_result(result2);
+						    skygw_log_write(LE,"Error: Unexpected result for \"SHOW VARIABLES LIKE 'wsrep_sst_method'\". Expected 2 columns."
+							    " MySQL Version: %s",version_str);
+						    return;
+						}
 					while ((row = mysql_fetch_row(result)))
 					{
 						if (strncmp(row[1], "xtrabackup", 10) == 0)
 							isjoined = 1;
 					}
+					mysql_free_result(result2);
 				}
 			}
 		}
@@ -398,6 +415,15 @@ char 			*server_string;
 		&& (result = mysql_store_result(database->con)) != NULL)
 	{
 		long local_index = -1;
+
+		if(mysql_field_count(database->con) < 2)
+		{
+		    mysql_free_result(result);
+		    skygw_log_write(LE,"Error: Unexpected result for \"SHOW STATUS LIKE 'wsrep_local_index'\". Expected 2 columns."
+							    " MySQL Version: %s",version_str);
+		    return;
+		}
+
 		while ((row = mysql_fetch_row(result)))
 		{
 			local_index = strtol(row[1], NULL, 10);

server/modules/monitor/mmmon.c

@@ -367,6 +367,14 @@ char 		  *server_string;
         {
                 long server_id = -1;
 
+		if(mysql_field_count(database->con) != 1)
+		{
+		    mysql_free_result(result);
+		    skygw_log_write(LE,"Error: Unexpected result for 'SELECT @@server_id'. Expected 1 column."
+				    " MySQL Version: %s",version_str);
+		    return;
+		}
+
                 while ((row = mysql_fetch_row(result)))
                 {
                         server_id = strtol(row[0], NULL, 10);
@@ -393,6 +401,15 @@ char 		  *server_string;
 			int i = 0;
 			long master_id = -1;
 
+			if(mysql_field_count(database->con) < 42)
+			{
+			    mysql_free_result(result);
+			    skygw_log_write(LE,"Error: \"SHOW ALL SLAVES STATUS\" "
+				    "returned less than the expected amount of columns. Expected 42 columns"
+				    " MySQL Version: %s",version_str);
+			    return;
+			}
+
 			while ((row = mysql_fetch_row(result)))
 			{
 				/* get Slave_IO_Running and Slave_SQL_Running values*/
@@ -432,6 +449,30 @@ char 		  *server_string;
 		{
 			long master_id = -1;
 
+			if(mysql_field_count(database->con) < 40)
+			{
+			    mysql_free_result(result);
+
+			    if(server_version < 5*10000 + 5*100)
+			    {
+				if(database->log_version_err)
+				{
+				    skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
+					    " for versions less than 5.5 does not have master_server_id, "
+					    "replication tree cannot be resolved for server %s."
+					    " MySQL Version: %s",database->server->unique_name,version_str);
+				    database->log_version_err = false;
+				}
+			    }
+			    else
+			    {
+				skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
+					"returned less than the expected amount of columns. Expected 40 columns."
+					" MySQL Version: %s",version_str);
+			    }
+			    return;
+			}
+
 			while ((row = mysql_fetch_row(result)))
 			{
 				/* get Slave_IO_Running and Slave_SQL_Running values*/
@@ -463,6 +504,13 @@ char 		  *server_string;
 	if (mysql_query(database->con, "SHOW GLOBAL VARIABLES LIKE 'read_only'") == 0
 		&& (result = mysql_store_result(database->con)) != NULL)
 	{
+		if(mysql_field_count(database->con) < 2)
+		{
+		    mysql_free_result(result);
+		    skygw_log_write(LE,"Error: Unexpected result for \"SHOW GLOBAL VARIABLES LIKE 'read_only'\". Expected 2 columns."
+				    " MySQL Version: %s",version_str);
+		    return;
+		}
 
 		while ((row = mysql_fetch_row(result)))
 		{

server/modules/monitor/mysql_mon.c

@@ -408,6 +408,13 @@ char 		  *server_string;
                 && (result = mysql_store_result(database->con)) != NULL)
         {
                 long server_id = -1;
+		if(mysql_field_count(database->con) != 1)
+		{
+		    mysql_free_result(result);
+		    skygw_log_write(LE,"Error: Unexpected result for \"SELECT @@server_id\". Expected 1 columns."
+				    " MySQL Version: %s",version_str);
+		    return;
+		}
                 while ((row = mysql_fetch_row(result)))
                 {
                         server_id = strtol(row[0], NULL, 10);
@@ -433,6 +440,16 @@ char 		  *server_string;
 		{
 			int i = 0;
 			long master_id = -1;
+
+			if(mysql_field_count(database->con) < 42)
+			{
+			    mysql_free_result(result);
+			    skygw_log_write(LE,"Error: \"SHOW ALL SLAVES STATUS\" "
+				    "returned less than the expected amount of columns. Expected 42 columns."
+				    " MySQL Version: %s",version_str);
+			    return;
+			}
+
 			while ((row = mysql_fetch_row(result)))
 			{
 				/* get Slave_IO_Running and Slave_SQL_Running values*/
@@ -471,6 +488,29 @@ char 		  *server_string;
 			&& (result = mysql_store_result(database->con)) != NULL)
 		{
 			long master_id = -1;
+			if(mysql_field_count(database->con) < 40)
+			{
+			    mysql_free_result(result);
+			    if(server_version < 5*10000 + 5*100)
+			    {
+				if(database->log_version_err)
+				{
+				    skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
+					    " for versions less than 5.5 does not have master_server_id, "
+					    "replication tree cannot be resolved for server %s."
+					    " MySQL Version: %s",database->server->unique_name,version_str);
+				    database->log_version_err = false;
+				}
+			    }
+			    else
+			    {
+				skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
+					"returned less than the expected amount of columns. Expected 40 columns."
+					" MySQL Version: %s",version_str);
+			    }
+			    return;
+			}
+
 			while ((row = mysql_fetch_row(result)))
 			{
 				/* get Slave_IO_Running and Slave_SQL_Running values*/

server/modules/monitor/ndbclustermon.c

@@ -323,6 +323,14 @@ char 			*server_string;
 	if (mysql_query(database->con, "SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'") == 0
 		&& (result = mysql_store_result(database->con)) != NULL)
 	{
+		if(mysql_field_count(database->con) < 2)
+		{
+		    mysql_free_result(result);
+		    skygw_log_write(LE,"Error: Unexpected result for \"SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'\". Expected 2 columns."
+				    " MySQL Version: %s",version_str);
+		    return;
+		}
+
 		while ((row = mysql_fetch_row(result)))
 		{
 			if (atoi(row[1]) > 0)
@@ -335,6 +343,14 @@ char 			*server_string;
 	if (mysql_query(database->con, "SHOW STATUS LIKE 'Ndb_cluster_node_id'") == 0
 		&& (result = mysql_store_result(database->con)) != NULL)
 	{
+		if(mysql_field_count(database->con) < 2)
+		{
+		    mysql_free_result(result);
+		    skygw_log_write(LE,"Error: Unexpected result for \"SHOW STATUS LIKE 'Ndb_cluster_node_id'\". Expected 2 columns."
+				    " MySQL Version: %s",version_str);
+		    return;
+		}
+
 		long cluster_node_id = -1;
 		while ((row = mysql_fetch_row(result)))
 		{

server/modules/routing/readwritesplit/readwritesplit.c

@@ -226,7 +226,7 @@ static rses_property_t* mysql_sescmd_get_property(
 static rses_property_t* rses_property_init(
 	rses_property_type_t prop_type);
 
-static void rses_property_add(
+static int rses_property_add(
 	ROUTER_CLIENT_SES* rses,
 	rses_property_t*   prop);
 
@@ -1244,7 +1244,8 @@ static bool get_dcb(
 				SERVER_IS_SLAVE(b->backend_server) &&
 				(max_rlag == MAX_RLAG_UNDEFINED ||
 				(b->backend_server->rlag != MAX_RLAG_NOT_AVAILABLE &&
-				b->backend_server->rlag <= max_rlag)))
+				b->backend_server->rlag <= max_rlag)) &&
+				 !rses->rses_config.master_reads)
 			{
 				/** found slave */
 				candidate_bref = &backend_ref[i];
@@ -2942,6 +2943,11 @@ static void bref_clear_state(
         backend_ref_t* bref,
         bref_state_t   state)
 {
+    if(bref == NULL)
+    {
+	skygw_log_write(LE,"Error: NULL parameter passed to bref_clear_state. (%s:%d)",__FILE__,__LINE__);
+	return;
+    }
         if (state != BREF_WAITING_RESULT)
         {
                 bref->bref_state &= ~state;
@@ -2971,6 +2977,11 @@ static void bref_set_state(
         backend_ref_t* bref,
         bref_state_t   state)
 {
+    if(bref == NULL)
+    {
+	skygw_log_write(LE,"Error: NULL parameter passed to bref_set_state. (%s:%d)",__FILE__,__LINE__);
+	return;
+    }
         if (state != BREF_WAITING_RESULT)
         {
                 bref->bref_state |= state;
@@ -3534,7 +3545,8 @@ static rses_property_t* rses_property_init(
 	prop = (rses_property_t*)calloc(1, sizeof(rses_property_t));
 	if (prop == NULL)
 	{
-		goto return_prop;
+	    skygw_log_write(LE,"Error: Malloc returned NULL. (%s:%d)",__FILE__,__LINE__);
+	    return NULL;
 	}
 	prop->rses_prop_type = prop_type;
 #if defined(SS_DEBUG)
@@ -3553,6 +3565,11 @@ return_prop:
 static void rses_property_done(
 	rses_property_t* prop)
 {
+    if(prop == NULL)
+    {
+	skygw_log_write(LE,"Error: NULL parameter passed to rses_property_done. (%s:%d)",__FILE__,__LINE__);
+	return;
+    }
 	CHK_RSES_PROP(prop);
 	
 	switch (prop->rses_prop_type) {
@@ -3586,10 +3603,20 @@ static void rses_property_done(
  * 
  * Router client session must be locked.
  */
-static void rses_property_add(
+static int rses_property_add(
         ROUTER_CLIENT_SES* rses,
         rses_property_t*   prop)
 {
+    if(rses == NULL)
+    {
+	skygw_log_write(LE,"Error: Router client session is NULL. (%s:%d)",__FILE__,__LINE__);
+	return -1;
+    }
+    if(prop == NULL)
+    {
+	skygw_log_write(LE,"Error: Router client session property is NULL. (%s:%d)",__FILE__,__LINE__);
+	return -1;
+    }
         rses_property_t* p;
         
         CHK_CLIENT_RSES(rses);
@@ -3611,6 +3638,7 @@ static void rses_property_add(
                 }
                 p->rses_prop_next = prop;
         }
+	return 0;
 }
 
 /** 
@@ -3622,6 +3650,12 @@ static mysql_sescmd_t* rses_property_get_sescmd(
 {
         mysql_sescmd_t* sescmd;
 
+	if(prop == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to rses_property_get_sescmd. (%s:%d)",__FILE__,__LINE__);
+	    return NULL;
+	}
+
         CHK_RSES_PROP(prop);
         ss_dassert(prop->rses_prop_rsession == NULL ||
                 SPINLOCK_IS_LOCKED(&prop->rses_prop_rsession->rses_lock));
@@ -3635,22 +3669,6 @@ static mysql_sescmd_t* rses_property_get_sescmd(
         return sescmd;
 }
 
-/**
-static void rses_begin_locked_property_action(
-        rses_property_t* prop)
-{
-        CHK_RSES_PROP(prop);
-        spinlock_acquire(&prop->rses_prop_lock);
-}
-
-static void rses_end_locked_property_action(
-        rses_property_t* prop)
-{
-        CHK_RSES_PROP(prop);
-        spinlock_release(&prop->rses_prop_lock);
-}
-*/
-
 /**
  * Create session command property.
  */
@@ -3682,6 +3700,11 @@ static mysql_sescmd_t* mysql_sescmd_init (
 static void mysql_sescmd_done(
 	mysql_sescmd_t* sescmd)
 {
+    if(sescmd == NULL)
+    {
+	skygw_log_write(LE,"Error: NULL parameter passed to mysql_sescmd_done. (%s:%d)",__FILE__,__LINE__);
+	return;
+    }
 	CHK_RSES_PROP(sescmd->my_sescmd_prop);
 	gwbuf_free(sescmd->my_sescmd_buf);
         memset(sescmd, 0, sizeof(mysql_sescmd_t));
@@ -3854,6 +3877,12 @@ static bool sescmd_cursor_is_active(
 	sescmd_cursor_t* sescmd_cursor)
 {
 	bool succp;
+
+	if(sescmd_cursor == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_is_active. (%s:%d)",__FILE__,__LINE__);
+	    return false;
+	}
         ss_dassert(SPINLOCK_IS_LOCKED(&sescmd_cursor->scmd_cur_rses->rses_lock));
 
         succp = sescmd_cursor->scmd_cur_active;
@@ -3879,6 +3908,11 @@ static GWBUF* sescmd_cursor_clone_querybuf(
 	sescmd_cursor_t* scur)
 {
 	GWBUF* buf;
+	if(scur == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_clone_querybuf. (%s:%d)",__FILE__,__LINE__);
+	    return NULL;
+	}
 	ss_dassert(scur->scmd_cur_cmd != NULL);
 	
 	buf = gwbuf_clone(scur->scmd_cur_cmd->my_sescmd_buf);
@@ -3892,6 +3926,11 @@ static bool sescmd_cursor_history_empty(
 {
         bool succp;
 
+        if(scur == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_history_empty. (%s:%d)",__FILE__,__LINE__);
+	    return true;
+	}
         CHK_SESCMD_CUR(scur);
         
         if (scur->scmd_cur_rses->rses_properties[RSES_PROP_TYPE_SESCMD] == NULL)
@@ -3911,6 +3950,11 @@ static void sescmd_cursor_reset(
         sescmd_cursor_t* scur)
 {
         ROUTER_CLIENT_SES* rses;
+	if(scur == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_reset. (%s:%d)",__FILE__,__LINE__);
+	    return;
+	}
         CHK_SESCMD_CUR(scur);
         CHK_CLIENT_RSES(scur->scmd_cur_rses);
         rses = scur->scmd_cur_rses;
@@ -3927,6 +3971,11 @@ static bool execute_sescmd_history(
 {
         bool             succp;
         sescmd_cursor_t* scur;
+	if(bref == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to execute_sescmd_history. (%s:%d)",__FILE__,__LINE__);
+	    return false;
+	}
         CHK_BACKEND_REF(bref);
         
         scur = &bref->bref_sescmd_cur;
@@ -3963,6 +4012,11 @@ static bool execute_sescmd_in_backend(
 	int              rc = 0;
 	sescmd_cursor_t* scur;
 
+	if(backend_ref == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to execute_sescmd_in_backend. (%s:%d)",__FILE__,__LINE__);
+	    return false;
+	}
         if (BREF_IS_CLOSED(backend_ref))
         {
                 succp = false;
@@ -4083,6 +4137,12 @@ static bool sescmd_cursor_next(
 	rses_property_t* prop_curr;
 	rses_property_t* prop_next;
 
+	if(scur == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_next. (%s:%d)",__FILE__,__LINE__);
+	    return false;
+	}
+
         ss_dassert(scur != NULL);
         ss_dassert(*(scur->scmd_cur_ptr_property) != NULL);
         ss_dassert(SPINLOCK_IS_LOCKED(
@@ -4409,11 +4469,21 @@ static bool route_session_write(
          * prevent it from being released before properties
          * are cleaned up as a part of router sessionclean-up.
          */
-        prop = rses_property_init(RSES_PROP_TYPE_SESCMD);
+        if((prop = rses_property_init(RSES_PROP_TYPE_SESCMD)) == NULL)
+	{
+	    skygw_log_write(LE,"Error: Router session property initialization failed");
+	    rses_end_locked_router_action(router_cli_ses);
+	    return false;
+	}
         mysql_sescmd_init(prop, querybuf, packet_type, router_cli_ses);
         
         /** Add sescmd property to router client session */
-        rses_property_add(router_cli_ses, prop);
+        if(rses_property_add(router_cli_ses, prop) != 0)
+	{
+	    skygw_log_write(LE,"Error: Session property addition failed.");
+	    rses_end_locked_router_action(router_cli_ses);
+	    return false;
+	}
          
         for (i=0; i<router_cli_ses->rses_nbackends; i++)
         {
@@ -4537,6 +4607,9 @@ static void rwsplit_process_router_options(
         char*             value;
         select_criteria_t c;
 
+	if(options == NULL)
+	    return;
+
         for (i = 0; options[i]; i++)
         {
                 if ((value = strchr(options[i], '=')) == NULL)
@@ -4589,6 +4662,10 @@ static void rwsplit_process_router_options(
 			{
 			    router->rwsplit_config.disable_slave_recovery = config_truth_value(value);
 			}
+			else if(strcmp(options[i],"master_accept_reads") == 0)
+			{
+			    router->rwsplit_config.master_reads = config_truth_value(value);
+			}
                 }
         } /*< for */
 }
@@ -5083,10 +5160,9 @@ static int router_handle_state_switch(
 {
         backend_ref_t*     bref;
         int                rc = 1;
+        SERVER*            srv;
 	ROUTER_CLIENT_SES* rses;
         SESSION*           ses;
-        SERVER*            srv;
-        
         CHK_DCB(dcb);
         bref = (backend_ref_t *)data;
         CHK_BACKEND_REF(bref);
@@ -5107,7 +5183,6 @@ static int router_handle_state_switch(
 				STRSRVSTATUS(srv))));
 	ses = dcb->session;
         CHK_SESSION(ses);
-
 	rses = (ROUTER_CLIENT_SES *)dcb->session->router_session;
         CHK_CLIENT_RSES(rses);