When protocol closes DCB it calls dcb_close instead of dcb->func.close. dcb_close then calls dcb->func.close. This is now changed to all protocols and routers.

Rwsplit handles ERRACT_NEW_CONNECTION by clearing backend reference, removing callbacks and associating backend reference with new backend server. If it succeeds and the router session can continue, handleError returns true. Otherwise false. When ever false is returned it means that session must be closed.

Rwsplit now tolerates backend failures in a way that it searches new backends when monitor, backend, or client operation fails due to backend failure.

server/include/dcb.h

@@ -195,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;

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);
@@ -75,12 +81,12 @@ typedef struct router_object {
 	void	(*diagnostics)(ROUTER *instance, DCB *dcb);
 	void    (*clientReply)(ROUTER* instance, void* router_session, GWBUF* queue, DCB *backend_dcb);
 	void    (*handleError)(
-                        ROUTER* instance, 
-                        void* router_session, 
-                        char* message, 
-                        DCB *backend_dcb, 
-                        int action, 
-                        bool* succp);
+                        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;
 
@@ -97,10 +103,6 @@ typedef enum router_capability_t {
         RCAP_TYPE_PACKET_INPUT = (1 << 1)
 } router_capability_t;
 
-typedef enum error_action {
-        ERRACT_NEW_CONNECTION = 0x001,
-        ERRACT_REPLY_CLIENT   = 0x002
-} error_action_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/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 */