From 5021ed7c458fa8d995050e2480835f2cfac1de10 Mon Sep 17 00:00:00 2001 From: WuYunlong Date: Fri, 18 Sep 2020 16:10:54 +0800 Subject: [PATCH] Make IO threads killable so that they can be canceled at any time. This commit can be cherry picked to 6.0 only if we also cherry pick e9b6077. (cherry picked from commit 6c6ab16e5a31c09a6ea09f1b4638c121e610566a) --- src/networking.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/networking.c b/src/networking.c index b7d6d6211..e738d1c92 100644 --- a/src/networking.c +++ b/src/networking.c @@ -2948,6 +2948,7 @@ void *IOThreadMain(void *myid) { snprintf(thdname, sizeof(thdname), "io_thd_%ld", id); redis_set_thread_title(thdname); redisSetCpuAffinity(server.server_cpulist); + makeThreadKillable(); while(1) { /* Wait for start */