mirror
/
valkey
mirror of https://github.com/valkey-io/valkey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in IO thread shutdown during panic (#2898) 

## Problem
IO thread shutdown can deadlock during server panic when the main thread
calls `pthread_cancel()` while the IO thread holds its mutex, preventing
the thread from observing the cancellation.

## Solution  
Release the IO thread mutex before cancelling to ensure clean thread
termination.

## Testing
Reproducer:
```
bash
./src/valkey-server --io-threads 2 --enable-debug-command yes
./src/valkey-cli debug panic
```

Before: Server hangs indefinitely
After: Server terminates cleanly

Signed-off-by: Ouri Half <ourih@amazon.com>
This commit is contained in:
Ouri Half 2025-12-04 19:10:09 +02:00 committed by GitHub
parent c90e634f11
commit 3d65a4aecd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/io_threads.c
View File

@ -285,6 +285,10 @@ static void shutdownIOThread(int id) {
if (tid == pthread_self()) return; if (tid == pthread_self()) return;
if (tid == 0) return; if (tid == 0) return;
/* Only unlock mutex for inactive threads. Active threads are already unlocked. */
if (id >= server.active_io_threads_num) {
pthread_mutex_unlock(&io_threads_mutex[id]);
}
pthread_cancel(tid); pthread_cancel(tid);
if ((err = pthread_join(tid, NULL)) != 0) { if ((err = pthread_join(tid, NULL)) != 0) {