X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=0e9c52e835dc594d2fa773452045208a26ea3cac;hb=f96e4545bd7a4dd9c58eb7e8a42eafe0b18089ad;hp=34385579741f6f0273aee213576bd0a188a95b0e;hpb=f2ad556de9fb7e0920938f1e3d4b1fcb0709beb6;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 343855797..0e9c52e83 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -319,9 +319,9 @@ static void cleanup_relayd_ht(void)
 		destroy_relayd(relayd);
 	}
 
-	lttng_ht_destroy(consumer_data.relayd_ht);
-
 	rcu_read_unlock();
+
+	lttng_ht_destroy(consumer_data.relayd_ht);
 }
 
 /*
@@ -720,6 +720,8 @@ struct consumer_relayd_sock_pair *consumer_allocate_relayd_sock_pair(
 	obj->net_seq_idx = net_seq_idx;
 	obj->refcount = 0;
 	obj->destroy_flag = 0;
+	obj->control_sock.sock.fd = -1;
+	obj->data_sock.sock.fd = -1;
 	lttng_ht_node_init_u64(&obj->node, obj->net_seq_idx);
 	pthread_mutex_init(&obj->ctrl_sock_mutex, NULL);