Fix deadlock: unlock before pthread_exit()

Author: za-arthur

src/backup.c

@@ -2443,6 +2443,10 @@ stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished)
 	static uint32 prevtimeline = 0;
 	static XLogRecPtr prevpos = InvalidXLogRecPtr;
 
+	/* check for interrupt */
+	if (interrupted)
+		elog(ERROR, "Interrupted during backup");
+
 	/* we assume that we get called once at the end of each segment */
 	if (segment_finished)
 		elog(VERBOSE, _("finished segment at %X/%X (timeline %u)"),

src/utils/logger.c

@@ -131,6 +131,9 @@ exit_if_necessary(int elevel)
 		/* Interrupt other possible routines */
 		interrupted = true;
 
+		if (loggin_in_progress)
+			pthread_mutex_unlock(&log_file_mutex);
+
 		/* If this is not the main thread then don't call exit() */
 #ifdef WIN32
 		if (main_tid != GetCurrentThreadId())
@@ -250,13 +253,13 @@ elog_internal(int elevel, bool file_only, const char *fmt, va_list args)
 			va_end(std_args);
 	}
 
+	exit_if_necessary(elevel);
+
 	if (loggin_in_progress)
 	{
 		pthread_mutex_unlock(&log_file_mutex);
 		loggin_in_progress = false;
 	}
-
-	exit_if_necessary(elevel);
 }
 
 /*