X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;fp=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=292bd393874a85c1bffdb3800f54398cb31fdd0d;hp=482d4a63bd00a98c75ecb681390e4c211f69b62b;hb=9a951630b590d14966e19b8d54f078fe174c1f47;hpb=80db18da0437527e6cf3cc9e96f713a7ac21ae00

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 482d4a63b..292bd3938 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -3638,8 +3638,8 @@ int consumer_data_pending(uint64_t id)
 		ret = relayd_begin_data_pending(&relayd->control_sock,
 				relayd->relayd_session_id);
 		if (ret < 0) {
-			pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
 			/* Communication error thus the relayd so no data pending. */
+			pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
 			ERR("Relayd begin data pending failed. Cleaning up relayd %" PRIu64".", relayd->net_seq_idx);
 			lttng_consumer_cleanup_relayd(relayd);
 			goto data_not_pending;
@@ -3663,6 +3663,8 @@ int consumer_data_pending(uint64_t id)
 				goto data_pending;
 			}
 			if (ret < 0) {
+				ERR("Relayd data pending failed. Cleaning up relayd %" PRIu64".", relayd->net_seq_idx);
+				lttng_consumer_cleanup_relayd(relayd);
 				pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
 				pthread_mutex_unlock(&stream->lock);
 				goto data_not_pending;