Index: sbin/hastd/secondary.c
===================================================================
--- sbin/hastd/secondary.c	(wersja 212899)
+++ sbin/hastd/secondary.c	(kopia robocza)
@@ -393,17 +393,27 @@
 		pjdlog_errno(LOG_WARNING, "Unable to set connection timeout");
 
 	init_local(res);
+	init_environment();
+
+	/*
+	 * Create the control thread before sending any event to the parent,
+	 * as we can deadlock when parent sends control request to worker,
+	 * but worker has no control thread started yet, so parent waits.
+	 * In the meantime worker sends an event to the parent, but parent
+	 * is unable to handle the event, because it waits for control
+	 * request response.
+	 */
+	error = pthread_create(&td, NULL, ctrl_thread, res);
+	assert(error == 0);
+
 	init_remote(res, nvin);
-	init_environment();
 	event_send(res, EVENT_CONNECT);
 
 	error = pthread_create(&td, NULL, recv_thread, res);
 	assert(error == 0);
 	error = pthread_create(&td, NULL, disk_thread, res);
 	assert(error == 0);
-	error = pthread_create(&td, NULL, send_thread, res);
-	assert(error == 0);
-	(void)ctrl_thread(res);
+	(void)send_thread(res);
 }
 
 static void
Index: sbin/hastd/primary.c
===================================================================
--- sbin/hastd/primary.c	(wersja 212899)
+++ sbin/hastd/primary.c	(kopia robocza)
@@ -807,10 +807,20 @@
 	proto_send(res->hr_event, NULL, 0);
 
 	init_local(res);
+	init_ggate(res);
+	init_environment(res);
+	/*
+	 * Create the control thread before sending any event to the parent,
+	 * as we can deadlock when parent sends control request to worker,
+	 * but worker has no control thread started yet, so parent waits.
+	 * In the meantime worker sends an event to the parent, but parent
+	 * is unable to handle the event, because it waits for control
+	 * request response.
+	 */
+	error = pthread_create(&td, NULL, ctrl_thread, res);
+	assert(error == 0);
 	if (real_remote(res) && init_remote(res, NULL, NULL))
 		sync_start();
-	init_ggate(res);
-	init_environment(res);
 	error = pthread_create(&td, NULL, ggate_recv_thread, res);
 	assert(error == 0);
 	error = pthread_create(&td, NULL, local_send_thread, res);
@@ -823,8 +833,6 @@
 	assert(error == 0);
 	error = pthread_create(&td, NULL, sync_thread, res);
 	assert(error == 0);
-	error = pthread_create(&td, NULL, ctrl_thread, res);
-	assert(error == 0);
 	(void)guard_thread(res);
 }