summaryrefslogtreecommitdiff
path: root/src/networking.c
diff options
context:
space:
mode:
authorWuYunlong <xzsyeb@126.com>2020-09-18 16:10:54 +0800
committerOran Agra <oran@redislabs.com>2020-10-27 09:12:01 +0200
commit59866fcd3052710a53ece79ef4311158384c9c95 (patch)
tree665cfc8188000fa4eee25869f06858f177eea778 /src/networking.c
parent4832cf4fd695a98ecc70dc2354dd221b61cac339 (diff)
downloadredis-59866fcd3052710a53ece79ef4311158384c9c95.tar.gz
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 f866023. (cherry picked from commit c37acb82aa4b1c3317f9bc1b05fc5ab8af23ba00)
Diffstat (limited to 'src/networking.c')
-rw-r--r--src/networking.c1
1 files changed, 1 insertions, 0 deletions
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 */