Add io-cpulist conf to configure io-threads affinity

Author: raaja-liftoff

redis.conf

@@ -2465,9 +2465,12 @@ jemalloc-bg-thread yes
 # the bgsave child process. The syntax to specify the cpu list is the same as
 # the taskset command:
 #
-# Set redis server/io threads to cpu affinity 0,2,4,6:
+# Set redis main thread to cpu affinity 0,2,4,6:
 # server-cpulist 0-7:2
 #
+# Set redis io threads to cpu affinity 5,7:
+# io-cpulist 5,7
+#
 # Set bio threads to cpu affinity 1,3:
 # bio-cpulist 1,3
 #

src/config.c

@@ -3196,6 +3196,7 @@ standardConfig static_configs[] = {
     createStringConfig("appendfilename", NULL, IMMUTABLE_CONFIG, ALLOW_EMPTY_STRING, server.aof_filename, "appendonly.aof", isValidAOFfilename, NULL),
     createStringConfig("appenddirname", NULL, IMMUTABLE_CONFIG, ALLOW_EMPTY_STRING, server.aof_dirname, "appendonlydir", isValidAOFdirname, NULL),
     createStringConfig("server-cpulist", "server_cpulist", IMMUTABLE_CONFIG, EMPTY_STRING_IS_NULL, server.server_cpulist, NULL, NULL, NULL),
+    createStringConfig("io-cpulist", "io_cpulist", IMMUTABLE_CONFIG, EMPTY_STRING_IS_NULL, server.io_cpulist, NULL, NULL, NULL),
     createStringConfig("bio-cpulist", "bio_cpulist", IMMUTABLE_CONFIG, EMPTY_STRING_IS_NULL, server.bio_cpulist, NULL, NULL, NULL),
     createStringConfig("aof-rewrite-cpulist", "aof_rewrite_cpulist", IMMUTABLE_CONFIG, EMPTY_STRING_IS_NULL, server.aof_rewrite_cpulist, NULL, NULL, NULL),
     createStringConfig("bgsave-cpulist", "bgsave_cpulist", IMMUTABLE_CONFIG, EMPTY_STRING_IS_NULL, server.bgsave_cpulist, NULL, NULL, NULL),

src/iothread.c

@@ -856,7 +856,7 @@ void *IOThreadMain(void *ptr) {
     char thdname[16];
     snprintf(thdname, sizeof(thdname), "io_thd_%d", t->id);
     redis_set_thread_title(thdname);
-    redisSetCpuAffinity(server.server_cpulist);
+    redisSetCpuAffinity(server.io_cpulist);
     makeThreadKillable();
     aeSetBeforeSleepProc(t->el, IOThreadBeforeSleep);
     aeSetAfterSleepProc(t->el, IOThreadAfterSleep);

src/server.c

@@ -7992,6 +7992,7 @@ int main(int argc, char **argv) {
     }
     InitServerLast();
 
+    redisSetCpuAffinity(server.server_cpulist);
     if (!server.sentinel_mode) {
         /* Things not needed when running in Sentinel mode. */
         serverLog(LL_NOTICE,"Server initialized");
@@ -8038,7 +8039,6 @@ int main(int argc, char **argv) {
         serverLog(LL_WARNING,"WARNING: You specified a maxmemory value that is less than 1MB (current value is %llu bytes). Are you sure this is what you really want?", server.maxmemory);
     }
 
-    redisSetCpuAffinity(server.server_cpulist);
     setOOMScoreAdj(-1);
 
     aeMain(server.el);

src/server.h

@@ -2481,7 +2481,8 @@ struct redisServer {
     int tls_auth_clients;
     redisTLSContextConfig tls_ctx_config;
     /* cpu affinity */
-    char *server_cpulist; /* cpu affinity list of redis server main/io thread. */
+    char *server_cpulist; /* cpu affinity list of redis server main thread. */
+    char *io_cpulist; /* cpu affinity list of io thread. */
     char *bio_cpulist; /* cpu affinity list of bio thread. */
     char *aof_rewrite_cpulist; /* cpu affinity list of aof rewrite process. */
     char *bgsave_cpulist; /* cpu affinity list of bgsave process. */

tests/unit/introspection.tcl

@@ -581,10 +581,12 @@ start_server {tags {"introspection"}} {
             slaveof
             requirepass
             server-cpulist
+            io-cpulist
             bio-cpulist
             aof-rewrite-cpulist
             bgsave-cpulist
             server_cpulist
+            io_cpulist
             bio_cpulist
             aof_rewrite_cpulist
             bgsave_cpulist