From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 13 May 2015 14:30:31 +0000 (+0100)
Subject: Break deadlock in redis timeout logic.
X-Git-Tag: 0.9.0~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7cb545ef98d323c142bff391a8a9dfe7b9148e97;p=rspamd.git

Break deadlock in redis timeout logic.
---

diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
index 8111ccf89..4af8d20b8 100644
--- a/src/lua/lua_redis.c
+++ b/src/lua/lua_redis.c
@@ -70,12 +70,13 @@ struct lua_redis_userdata {
 	lua_State *L;
 	struct rspamd_task *task;
 	struct event timeout;
-	gint cbref;
 	gchar *server;
 	gchar *reqline;
-	guint16 port;
 	gchar **args;
+	gint cbref;
 	guint nargs;
+	guint16 port;
+	guint16 terminated;
 };
 
 static void
@@ -98,6 +99,7 @@ lua_redis_fin (void *arg)
 	struct lua_redis_userdata *ud = arg;
 
 	if (ud->ctx) {
+		ud->terminated = 1;
 		redisAsyncFree (ud->ctx);
 		lua_redis_free_args (ud);
 		event_del (&ud->timeout);
@@ -206,6 +208,11 @@ lua_redis_callback (redisAsyncContext *c, gpointer r, gpointer priv)
 	redisReply *reply = r;
 	struct lua_redis_userdata *ud = priv;
 
+	if (ud->terminated) {
+		/* We are already at the termination stage, just go out */
+		return;
+	}
+
 	if (c->err == 0) {
 		if (r != NULL) {
 			if (reply->type != REDIS_REPLY_ERROR) {
@@ -393,6 +400,7 @@ lua_redis_make_request (lua_State *L)
 	}
 
 	if (ret) {
+		ud->terminated = 0;
 		ud->ctx = redisAsyncConnect (rspamd_inet_address_to_string (addr->addr),
 				rspamd_inet_address_get_port (addr->addr));