X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/ac1f6fd07a15ac7a14f27b8a5f4b5fb3dc6cf8ac..a1b1c1ea3adb864c8c2e3feb4eaed890a9b505cf:/src/bio.c?ds=sidebyside

diff --git a/src/bio.c b/src/bio.c
index eaac8e40..aa2cdf9f 100644
--- a/src/bio.c
+++ b/src/bio.c
@@ -108,9 +108,18 @@ void bioCreateBackgroundJob(int type, void *arg1, void *arg2, void *arg3) {
 void *bioProcessBackgroundJobs(void *arg) {
     struct bio_job *job;
     unsigned long type = (unsigned long) arg;
+    sigset_t sigset;
 
     pthread_detach(pthread_self());
     pthread_mutex_lock(&bio_mutex[type]);
+    /* Block SIGALRM so we are sure that only the main thread will
+     * receive the watchdog signal. */
+    sigemptyset(&sigset);
+    sigaddset(&sigset, SIGALRM);
+    if (pthread_sigmask(SIG_BLOCK, &sigset, NULL))
+        redisLog(REDIS_WARNING,
+            "Warning: can't mask SIGALRM in bio.c thread: %s", strerror(errno));
+
     while(1) {
         listNode *ln;