Mask SIGALRM everything but in the main thread.

This is required to ensure that the signal will be delivered to the main
thread when the watchdog timer expires.

diff --git a/src/bio.c b/src/bio.c
index eaac8e40d55663caf3fbacf4212a01247ba26972..aa2cdf9fbb5a0d9289eefa825c2aa62048b66f64 100644 (file)
--- 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;
 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]);
 
     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;
 
     while(1) {
         listNode *ln;