X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=66ae16bc8f09c224ffd3e1130bf9c1fa0ca0fa13;hb=e098433c90550d74288498f8c4474ef4c2daea68;hp=7c01bc772a008aa38a05a399c7acadf4849fd0a2;hpb=02d02e31d47c091a38154c9c188c08387902d97b;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 7c01bc772..66ae16bc8 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -644,7 +644,8 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.stream.cpu,
 				&alloc_ret,
 				channel->type,
-				channel->monitor);
+				channel->monitor,
+				msg.u.stream.trace_archive_id);
 		if (new_stream == NULL) {
 			switch (alloc_ret) {
 			case -ENOMEM:
@@ -1119,6 +1120,42 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		}
 		break;
 	}
+	case LTTNG_CONSUMER_ROTATE_CHANNEL:
+	{
+		DBG("Consumer rotate channel %" PRIu64, 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;
+		}
+
+		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");
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+		}
+
+		break;
+	}
 	case LTTNG_CONSUMER_ROTATE_RENAME:
 	{
 		DBG("Consumer rename session %" PRIu64 " after rotation, old path = \"%s\", new path = \"%s\"",
@@ -1144,6 +1181,40 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		}
 		break;
 	}
+	case LTTNG_CONSUMER_ROTATE_PENDING_RELAY:
+	{
+		uint32_t pending_reply;
+
+		DBG("Consumer rotate pending on relay for session %" PRIu64,
+				msg.u.rotate_pending_relay.session_id);
+		ret = lttng_consumer_rotate_pending_relay(
+				msg.u.rotate_pending_relay.session_id,
+				msg.u.rotate_pending_relay.relayd_id,
+				msg.u.rotate_pending_relay.chunk_id);
+		if (ret < 0) {
+			ERR("Rotate pending relay failed");
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+		} else {
+			pending_reply = !!ret;
+		}
+
+		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;
+		}
+
+		/* Send back returned value to session daemon */
+		ret = lttcomm_send_unix_sock(sock, &pending_reply,
+				sizeof(pending_reply));
+		if (ret < 0) {
+			PERROR("send data pending ret code");
+			goto error_fatal;
+		}
+		break;
+	}
 	case LTTNG_CONSUMER_MKDIR:
 	{
 		DBG("Consumer mkdir %s in session %" PRIu64,