Cherrypick Perconas fix for leaking descriptors with new xbstream.

vaintroub · vaintroub · commit ba9daddcd831 · 2017-06-22T12:05:36.000Z
percona/percona-xtrabackup@72c55f4
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;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,11 @@ extract_worker_thread_func(void *arg)`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`if (chunk.type == XB_CHUNK_TYPE_EOF) {`
	`447`	`+ pthread_mutex_lock(ctxt->mutex);`
`447`	`448`	`pthread_mutex_unlock(&entry->mutex);`
	`449`	`+ my_hash_delete(ctxt->filehash, (uchar *) entry);`
	`450`	`+ pthread_mutex_unlock(ctxt->mutex);`
	`451`	`+`
`448`	`452`	`continue;`
`449`	`453`	`}`
`450`	`454`