Merge branch 'develop' of github.com:skysql/MaxScale into develop

Conflicts:
	server/core/session.c
	server/modules/protocol/mysql_backend.c
	server/modules/routing/readwritesplit/readwritesplit.c

Resolved.

Addition of user in topfilter report and general tidyup

server/include/buffer.h

@@ -46,11 +46,14 @@
 
 typedef enum 
 {
-        GWBUF_TYPE_UNDEFINED = 0x0,
-        GWBUF_TYPE_PLAINSQL = 0x1,
-        GWBUF_TYPE_MYSQL     = 0x2
+        GWBUF_TYPE_UNDEFINED = 0x00,
+        GWBUF_TYPE_PLAINSQL  = 0x01,
+        GWBUF_TYPE_MYSQL     = 0x02
 } gwbuf_type_t;
 
+#define GWBUF_IS_TYPE_PLAINSQL(b) (b->gwbuf_type & GWBUF_TYPE_PLAINSQL)
+#define GWBUF_IS_TYPE_MYSQL(b) (b->gwbuf_type & GWBUF_TYPE_MYSQL)
+
 /**
  * A structure to encapsulate the data in a form that the data itself can be
  * shared between multiple GWBUF's without the need to make multiple copies

server/include/dcb.h

@@ -24,6 +24,8 @@
 #include <skygw_utils.h>
 #include <netinet/in.h>
 
+#define ERRHANDLE
+
 struct session;
 struct server;
 struct service;
@@ -163,7 +165,8 @@ typedef enum {
 	DCB_REASON_HIGH_WATER,		/*< Cross high water mark */
 	DCB_REASON_LOW_WATER,		/*< Cross low water mark */
 	DCB_REASON_ERROR,		/*< An error was flagged on the connection */
-	DCB_REASON_HUP			/*< A hangup was detected */
+        DCB_REASON_HUP,			/*< A hangup was detected */
+        DCB_REASON_NOT_RESPONDING       /*< Server connection was lost */
 } DCB_REASON;
 
 /**
@@ -192,6 +195,7 @@ typedef struct dcb_callback {
 typedef struct dcb {
 #if defined(SS_DEBUG)
         skygw_chk_t     dcb_chk_top;
+        bool            dcb_errhandle_called;
 #endif
         dcb_role_t      dcb_role;
         SPINLOCK        dcb_initlock;
@@ -204,12 +208,13 @@ typedef struct dcb {
 	int	 	fd;		/**< The descriptor */
 	dcb_state_t	state;		/**< Current descriptor state */
 	char		*remote;	/**< Address of remote end */
+	char		*user;		/**< User name for connection */
 	struct sockaddr_in ipv4;	/**< remote end IPv4 address */
 	void		*protocol;	/**< The protocol specific state */
 	struct session	*session;	/**< The owning session */
 	GWPROTOCOL	func;		/**< The functions for this descriptor */
 
-	unsigned int	writeqlen;	/**< Current number of byes in the write queue */
+	int		writeqlen;	/**< Current number of byes in the write queue */
 	SPINLOCK	writeqlock;	/**< Write Queue spinlock */
 	GWBUF		*writeq;	/**< Write Data Queue */
 	SPINLOCK	delayqlock;	/**< Delay Backend Write Queue spinlock */
@@ -230,6 +235,7 @@ typedef struct dcb {
 	unsigned int	high_water;	/**< High water mark */
 	unsigned int	low_water;	/**< Low water mark */
 #if defined(SS_DEBUG)
+        int             dcb_port;       /**< port of target server */
         skygw_chk_t     dcb_chk_tail;
 #endif
 } DCB;

server/include/router.h

@@ -66,6 +66,12 @@ typedef void *ROUTER;
  *
  * @see load_module
  */
+typedef enum error_action {
+        ERRACT_NEW_CONNECTION = 0x001,
+        ERRACT_REPLY_CLIENT   = 0x002
+} error_action_t;
+
+
 typedef struct router_object {
 	ROUTER	*(*createInstance)(SERVICE *service, char **options);
 	void	*(*newSession)(ROUTER *instance, SESSION *session);
@@ -74,7 +80,13 @@ typedef struct router_object {
 	int	(*routeQuery)(ROUTER *instance, void *router_session, GWBUF *queue);
 	void	(*diagnostics)(ROUTER *instance, DCB *dcb);
 	void    (*clientReply)(ROUTER* instance, void* router_session, GWBUF* queue, DCB *backend_dcb);
-	void    (*errorReply)(ROUTER* instance, void* router_session, char* message, DCB *backend_dcb, int action);
+	void    (*handleError)(
+                        ROUTER*        instance, 
+                        void*          router_session, 
+                        GWBUF*         errmsgbuf, 
+                        DCB*           backend_dcb, 
+                        error_action_t action, 
+                        bool*          succp);
         uint8_t (*getCapabilities)(ROUTER *instance, void* router_session);
 } ROUTER_OBJECT;
 
@@ -91,4 +103,6 @@ typedef enum router_capability_t {
         RCAP_TYPE_PACKET_INPUT = (1 << 1)
 } router_capability_t;
 
+        
+
 #endif

server/include/server.h

@@ -117,6 +117,11 @@ typedef struct server {
  */
 #define SERVER_IN_MAINT(server)		((server)->status & SERVER_MAINT)
 
+/** server is not master, slave or joined */
+#define SERVER_NOT_IN_CLUSTER(s)        (((s)->status & (SERVER_MASTER|SERVER_SLAVE|SERVER_JOINED)) == 0)
+
+#define SERVER_IS_IN_CLUSTER(s)         (((s)->status & (SERVER_MASTER|SERVER_SLAVE|SERVER_JOINED)) != 0)
+
 extern SERVER	*server_alloc(char *, char *, unsigned short);
 extern int	server_free(SERVER *);
 extern SERVER	*server_find_by_unique_name(char *);

server/include/service.h

@@ -155,6 +155,7 @@ extern	int	serviceStop(SERVICE *);
 extern	int	serviceRestart(SERVICE *);
 extern	int	serviceSetUser(SERVICE *, char *, char *);
 extern	int	serviceGetUser(SERVICE *, char **, char **);
+extern	void	serviceSetFilters(SERVICE *, char *);
 extern	int	serviceEnableRootUser(SERVICE *, int );
 extern	void	service_update(SERVICE *, char *, char *, char *);
 extern	int	service_refresh_users(SERVICE *);
@@ -169,4 +170,5 @@ bool service_set_slave_conn_limit (
 extern	void	dprintService(DCB *, SERVICE *);
 extern	void	dListServices(DCB *);
 extern	void	dListListeners(DCB *);
+char* service_get_name(SERVICE* svc);
 #endif

server/include/session.h

@@ -57,7 +57,7 @@ typedef enum {
     SESSION_STATE_ALLOC,            /*< for all sessions */
     SESSION_STATE_READY,            /*< for router session */
     SESSION_STATE_ROUTER_READY,     /*< for router session */
-    SESSION_STATE_STOPPING,         /*< router is being closed */
+    SESSION_STATE_STOPPING,         /*< session and router are being closed */
     SESSION_STATE_LISTENER,         /*< for listener session */
     SESSION_STATE_LISTENER_STOPPED, /*< for listener session */
     SESSION_STATE_FREE              /*< for all sessions */