[Fix] Add additional check to mark redis connection inactive

2 files changed, 14 insertions, 7 deletions

diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c
index 1d42ad3ff..17fa22b1e 100644
--- a/src/libserver/redis_pool.c
+++ b/src/libserver/redis_pool.c
@@ -394,12 +394,19 @@ rspamd_redis_pool_release_connection (struct rspamd_redis_pool *pool,
 			REF_RELEASE (conn);
 		}
 		else {
-			/* Just move it to the inactive queue */
-			g_queue_unlink (conn->elt->active, conn->entry);
-			g_queue_push_head_link (conn->elt->inactive, conn->entry);
-			conn->active = FALSE;
-			rspamd_redis_pool_schedule_timeout (conn);
-			msg_debug_rpool ("mark connection inactive");
+			/* Ensure that there are no callbacks attached to this conn */
+			if (ctx->replies.head == NULL) {
+				/* Just move it to the inactive queue */
+				g_queue_unlink (conn->elt->active, conn->entry);
+				g_queue_push_head_link (conn->elt->inactive, conn->entry);
+				conn->active = FALSE;
+				rspamd_redis_pool_schedule_timeout (conn);
+				msg_debug_rpool ("mark connection inactive");
+			}
+			else {
+				msg_debug_rpool ("closed connection due to callbacks leftover");
+				REF_RELEASE (conn);
+			}
 		}
 
 		REF_RELEASE (conn);
diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
index 3566c7e11..7c5e84735 100644
--- a/src/lua/lua_redis.c
+++ b/src/lua/lua_redis.c
@@ -751,7 +751,7 @@ lua_redis_make_request (lua_State *L)
 				sp_ud->w = NULL;
 			}
 
-			REDIS_RETAIN (ctx);
+			REDIS_RETAIN (ctx); /* Cleared by fin event */
 			ctx->cmds_pending ++;
 			double_to_tv (timeout, &tv);
 			event_set (&sp_ud->timeout, -1, EV_TIMEOUT, lua_redis_timeout, sp_ud);