Cherrypick Perconas fix for leaking descriptors with new xbstream.

percona/percona-xtrabackup@72c55f4
MariaDB · Jun 22, 2017 · ba9dadd · ba9dadd
1 parent f1a6d24
commit ba9dadd
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/extra/mariabackup/xbstream.c b/extra/mariabackup/xbstream.c
@@ -444,7 +444,11 @@ extract_worker_thread_func(void *arg)
 		}
 
 		if (chunk.type == XB_CHUNK_TYPE_EOF) {
+			pthread_mutex_lock(ctxt->mutex);
 			pthread_mutex_unlock(&entry->mutex);
+			my_hash_delete(ctxt->filehash, (uchar *) entry);
+			pthread_mutex_unlock(ctxt->mutex);
+
 			continue;
 		}