MDEV-26558 Fix a deadlock due to cyclic dependence

Fix a potential deadlock bug between locks ctrl_mutex and entry->mutex
MariaDB · Nov 24, 2021 · f809a4f · f809a4f
1 parent ef179da
commit f809a4f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/extra/mariabackup/xbstream.cc b/extra/mariabackup/xbstream.cc
@@ -443,8 +443,8 @@ extract_worker_thread_func(void *arg)
 		}
 
 		if (chunk.type == XB_CHUNK_TYPE_EOF) {
-			pthread_mutex_lock(ctxt->mutex);
 			pthread_mutex_unlock(&entry->mutex);
+			pthread_mutex_lock(ctxt->mutex);
 			my_hash_delete(ctxt->filehash, (uchar *) entry);
 			pthread_mutex_unlock(ctxt->mutex);