From 6e803c647b474ae699ab51b2c0a0ba930c5e51bc Mon Sep 17 00:00:00 2001
From: counterpoint <counterpoint@aliro.org>
Date: Wed, 3 Jun 2015 10:02:27 +0100
Subject: [PATCH] Fix bugs, try different arrangement of dcb_close code.

---
 server/core/config.c |  6 ++--
 server/core/dcb.c    | 75 +++++++++++++++++++++-----------------------
 2 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/server/core/config.c b/server/core/config.c
index 8b0873efa..94990600b 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -619,7 +619,6 @@ hashtable_memory_fns(monitorhash,strdup,NULL,free,NULL);
 		}
 		else if (!strcmp(type, "server"))
 		{
-                    SERVER *server = obj->element;
                         char *address;
 			char *port;
 			char *protocol;
@@ -632,8 +631,6 @@ hashtable_memory_fns(monitorhash,strdup,NULL,free,NULL);
 			monuser = config_get_value(obj->parameters,
                                                    "monitoruser");
 			monpw = config_get_value(obj->parameters, "monitorpw");
-                        server->persistpoolmax = config_get_value(obj->parameters, "persistpoolmax");
-                        server->persistmaxtime = config_get_value(obj->parameters, "persistmaxtime");
 
 			if (address && port && protocol)
 			{
@@ -667,6 +664,9 @@ hashtable_memory_fns(monitorhash,strdup,NULL,free,NULL);
 			}
 			if (obj->element)
 			{
+                                SERVER *server = obj->element;
+                                server->persistpoolmax = strtol(config_get_value(obj->parameters, "persistpoolmax"), NULL, 0);
+                                server->persistmaxtime = strtol(config_get_value(obj->parameters, "persistmaxtime"), NULL, 0);
 				CONFIG_PARAMETER *params = obj->parameters;
 				while (params)
 				{
diff --git a/server/core/dcb.c b/server/core/dcb.c
index bdab6a9be..3974987e2 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -1296,25 +1296,44 @@ dcb_close(DCB *dcb)
         */
 	if (dcb->state == DCB_STATE_POLLING)
 	{
+            rc = poll_remove_dcb(dcb);
+            if (rc)
+            {
+                LOGIF(LE, (skygw_log_write(
+                    LOGFILE_ERROR,
+                    "Error : Removing DCB fd == %d in state %s from "
+                    "poll set failed.",
+                    dcb->fd,
+                    STRDCBSTATE(dcb->state))));
+            } 
+            else
+            {
+                LOGIF(LD, (skygw_log_write(
+                    LOGFILE_DEBUG,
+                    "%lu [dcb_close] Removed dcb %p in state %s from "
+                    "poll set.",
+                    pthread_self(),
+                    dcb,
+                    STRDCBSTATE(dcb->state))));
+            }
+            
             char *user;
             user = session_getUser(dcb->session);
-            if (user && dcb->server 
-                    && dcb->server->persistpoolmax 
-                    && dcb_persistent_clean_count(dcb) < dcb->server->persistpoolmax)
+            if (!rc
+                && user 
+                && dcb->server 
+                && dcb->server->persistpoolmax 
+                && dcb_persistent_clean_count(dcb) < dcb->server->persistpoolmax)
             {
                 dcb->user = strdup(user);
                 spinlock_acquire(&dcb->server->persistlock);
                 dcb->nextpersistent = dcb->server->persistent;
                 dcb->server->persistent = dcb;
-                if (poll_remove_dcb(dcb))
-                {
-                    /* Error */
-                    spinlock_release(&dcb->server->persistlock);
-                    return;
-                }
                 dcb->session = NULL;
                 spinlock_release(&dcb->server->persistlock);
                 atomic_add(&dcb->server->stats.n_persistent, 1);
+                /* Because we're not going to close the connection, need to do */
+                /* the session closedown processing here */
                 if (dcb->session)
                 {
                     spinlock_acquire(&dcb->session->ses_lock);
@@ -1323,11 +1342,10 @@ dcb_close(DCB *dcb)
                      * Otherwise only this backend connection is closed.
                      */
                     if (dcb->session->state == SESSION_STATE_STOPPING &&
-                    dcb->session->client != NULL &&
-                    dcb->session->client->state == DCB_STATE_POLLING)
+                        dcb->session->client != NULL &&
+                        dcb->session->client->state == DCB_STATE_POLLING)
                     {
                         spinlock_release(&dcb->session->ses_lock);
-			
                         /** Close client DCB */
                         dcb_close(dcb->session->client);
                     }
@@ -1336,30 +1354,9 @@ dcb_close(DCB *dcb)
                         spinlock_release(&dcb->session->ses_lock);
                     }
                 }
-                return;
             }
-
-            rc = poll_remove_dcb(dcb);
-
-		if (rc == 0) {
-			LOGIF(LD, (skygw_log_write(
-				LOGFILE_DEBUG,
-				"%lu [dcb_close] Removed dcb %p in state %s from "
-				"poll set.",
-				pthread_self(),
-				dcb,
-				STRDCBSTATE(dcb->state))));
-		} else {
-			LOGIF(LE, (skygw_log_write(
-				LOGFILE_ERROR,
-				"Error : Removing DCB fd == %d in state %s from "
-				"poll set failed.",
-				dcb->fd,
-				STRDCBSTATE(dcb->state))));
-		}
-	
-		if (rc == 0)
-		{
+            else if (!rc)
+            {
 			/**
 			 * close protocol and router session
 			 */
@@ -1374,10 +1371,10 @@ dcb_close(DCB *dcb)
 			{
 				dcb_add_to_zombieslist(dcb);
 			}
-		}
-	        ss_dassert(dcb->state == DCB_STATE_NOPOLLING ||
-					dcb->state == DCB_STATE_ZOMBIE);	
-	}
+            }
+            ss_dassert(dcb->state == DCB_STATE_NOPOLLING ||
+                dcb->state == DCB_STATE_ZOMBIE);	
+        }
 }
 
 /**