Merge remote-tracking branch 'origin/MAX-324' into MAX-324

Conflicts:
	server/modules/routing/dbshard/dbshard.c

server/MaxScale_template.cnf

@@ -31,7 +31,7 @@ threads=4
 #	backend_write_timeout=<timeout in seconds>
 #	backend_read_timeout=<timeout in seconds>
 #
-## mysql_monitor specific options:
+## MySQL monitor-specific options:
 #
 # Enable detection of replication slaves lag via replication_heartbeat 
 # table - optional.
@@ -43,6 +43,13 @@ threads=4
 #
 # 	detect_stale_master=[1|0] (default 0)
 #
+## Galera monitor-specific options:
+#
+# If disable_master_failback is not set, recovery of previously failed master 
+# causes mastership to be switched back to it. Enabling the option prevents it.
+#
+#	disable_master_failback=[0|1] (default 0)
+#
 ## Examples:
 
 [MySQL Monitor]
@@ -65,6 +72,7 @@ servers=server1,server2,server3
 user=myuser
 passwd=mypwd
 monitor_interval=10000
+#disable_master_failback=
 
 ## Filter definition
 #

server/modules/include/dbshard.h

@@ -75,18 +75,16 @@ struct router_instance;
 
 typedef enum {
 	TARGET_UNDEFINED    = 0x00,
-        TARGET_MASTER       = 0x01,
-        TARGET_SLAVE        = 0x02,
-        TARGET_NAMED_SERVER = 0x04,
-        TARGET_ALL          = 0x08,
-        TARGET_RLAG_MAX     = 0x10
+	TARGET_MASTER       = 0x01,
+	TARGET_SLAVE        = 0x02,
+	TARGET_NAMED_SERVER = 0x04,
+	TARGET_ALL          = 0x08,
+	TARGET_RLAG_MAX     = 0x10
 } route_target_t;
 
-#define TARGET_IS_MASTER(t)       (t & TARGET_MASTER)
-#define TARGET_IS_SLAVE(t)        (t & TARGET_SLAVE)
+
 #define TARGET_IS_NAMED_SERVER(t) (t & TARGET_NAMED_SERVER)
 #define TARGET_IS_ALL(t)          (t & TARGET_ALL)
-#define TARGET_IS_RLAG_MAX(t)     (t & TARGET_RLAG_MAX)
 
 typedef struct rses_property_st rses_property_t;
 typedef struct router_client_session ROUTER_CLIENT_SES;
@@ -100,24 +98,6 @@ typedef enum rses_property_type_t {
 	RSES_PROP_TYPE_COUNT=RSES_PROP_TYPE_LAST+1
 } rses_property_type_t;
 
-
-
-/**
- * This criteria is used when backends are chosen for a router session's use.
- * Backend servers are sorted to ascending order according to the criteria
- * and top N are chosen.
- */
-typedef enum select_criteria {
-        UNDEFINED_CRITERIA=0,
-        LEAST_GLOBAL_CONNECTIONS, /*< all connections established by MaxScale */
-        LEAST_ROUTER_CONNECTIONS, /*< connections established by this router */
-        LEAST_BEHIND_MASTER,
-        LEAST_CURRENT_OPERATIONS,
-        DEFAULT_CRITERIA=LEAST_CURRENT_OPERATIONS,
-        LAST_CRITERIA /*< not used except for an index */
-} select_criteria_t;
-
-
 /** default values for rwsplit configuration parameters */
 #define CONFIG_MAX_SLAVE_CONN 1
 #define CONFIG_MAX_SLAVE_RLAG -1 /*< not used */
@@ -232,11 +212,9 @@ typedef struct backend_ref_st {
 } backend_ref_t;
 
 
-typedef struct rwsplit_config_st {
+typedef struct dbshard_config_st {
         int               rw_max_slave_conn_percent;
         int               rw_max_slave_conn_count;
-        select_criteria_t rw_slave_select_criteria;
-        int               rw_max_slave_replication_lag;
 	target_t          rw_use_sql_variables_in;	
 } rwsplit_config_t;
      

server/modules/protocol/maxscaled.c

@@ -374,8 +374,8 @@ int                     rc;
         rc = listen(listener->fd, SOMAXCONN);
         
         if (rc == 0) {
-		LOGIF(LD, (skygw_log_write(
-                           LOGFILE_DEBUG,
+		LOGIF(LM, (skygw_log_write(
+                           LOGFILE_MESSAGE,
                     	"Listening maxscale connections at %s\n",
                     	config)));
         } else {

server/modules/protocol/mysql_common.c

@@ -577,8 +577,8 @@ int gw_send_authentication_to_backend(
 	dcb = conn->owner_dcb;
         final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities);
 
-	/** Copy client's flags to backend */
-	final_capabilities |= conn->client_capabilities;
+	/** Copy client's flags to backend but with the known capabilities mask */
+	final_capabilities |= (conn->client_capabilities & GW_MYSQL_CAPABILITIES_CLIENT);
 
 	/* get charset the client sent and use it for connection auth */
 	charset = conn->charset;

server/modules/routing/readwritesplit/readwritesplit.c

@@ -3220,8 +3220,6 @@ static bool select_connect_backend_servers(
                                 atomic_add(&backend_ref[i].bref_backend->backend_conn_count, -1);
                         }
                 }
-                master_connected = false;
-                slaves_connected = 0;
         }
 return_succp: