X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=68d69bb2a658658ef37dbd83b9c2094a40a4924a;hp=c223fa395af172525985e92bdaf8b39058647f6d;hb=92b7a7f81a94f7616c155aed8a213edd68937a57;hpb=5b951542a175819b62269e6904641f1a26149c96

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index c223fa395..68d69bb2a 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -1084,35 +1084,44 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	}
 	case LTTNG_CONSUMER_ROTATE_CHANNEL:
 	{
-		DBG("Consumer rotate channel %" PRIu64, msg.u.rotate_channel.key);
+		struct lttng_consumer_channel *channel;
+		uint64_t key = msg.u.rotate_channel.key;
 
-		/*
-		 * Sample the rotate position of all the streams in this channel.
-		 */
-		ret = lttng_consumer_rotate_channel(msg.u.rotate_channel.key,
-				msg.u.rotate_channel.pathname,
-				msg.u.rotate_channel.relayd_id,
-				msg.u.rotate_channel.metadata,
-				msg.u.rotate_channel.new_chunk_id,
-				ctx);
-		if (ret < 0) {
-			ERR("Rotate channel failed");
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
-		}
+		DBG("Consumer rotate channel %" PRIu64, key);
 
-		health_code_update();
+		channel = consumer_find_channel(key);
+		if (!channel) {
+			ERR("Channel %" PRIu64 " not found", key);
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+		} else {
+			/*
+			 * Sample the rotate position of all the streams in this channel.
+			 */
+			ret = lttng_consumer_rotate_channel(channel, key,
+					msg.u.rotate_channel.pathname,
+					msg.u.rotate_channel.relayd_id,
+					msg.u.rotate_channel.metadata,
+					msg.u.rotate_channel.new_chunk_id,
+					ctx);
+			if (ret < 0) {
+				ERR("Rotate channel failed");
+				ret_code = LTTCOMM_CONSUMERD_ROTATION_FAIL;
+			}
 
+			health_code_update();
+		}
 		ret = consumer_send_status_msg(sock, ret_code);
 		if (ret < 0) {
 			/* Somehow, the session daemon is not responding anymore. */
 			goto end_nosignal;
 		}
-
-		/* Rotate the streams that are ready right now. */
-		ret = lttng_consumer_rotate_ready_streams(
-				msg.u.rotate_channel.key, ctx);
-		if (ret < 0) {
-			ERR("Rotate ready streams failed");
+		if (channel) {
+			/* Rotate the streams that are ready right now. */
+			ret = lttng_consumer_rotate_ready_streams(
+					channel, key, ctx);
+			if (ret < 0) {
+				ERR("Rotate ready streams failed");
+			}
 		}
 
 		break;
@@ -1130,7 +1139,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.rotate_rename.relayd_id);
 		if (ret < 0) {
 			ERR("Rotate rename failed");
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_ROTATE_RENAME_FAILED;
 		}
 
 		health_code_update();
@@ -1154,7 +1163,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.check_rotation_pending_local.chunk_id);
 		if (pending < 0) {
 			ERR("Local rotation pending check failed with code %i", pending);
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_ROTATION_PENDING_LOCAL_FAILED;
 		} else {
 			pending_reply = !!pending;
 		}
@@ -1198,7 +1207,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.check_rotation_pending_relay.chunk_id);
 		if (pending < 0) {
 			ERR("Relayd rotation pending check failed with code %i", pending);
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_ROTATION_PENDING_RELAY_FAILED;
 		} else {
 			pending_reply = !!pending;
 		}
@@ -1240,7 +1249,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.mkdir.relayd_id);
 		if (ret < 0) {
 			ERR("consumer mkdir failed");
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_MKDIR_FAILED;
 		}
 
 		health_code_update();