X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=93df59ccdc97d8fe26578866a96ff48229015110;hb=836c7d541d9647b8ee00469fbd667b1a04916d30;hp=e067cb835e1a2739dfa35f83ce32a3d3c59b586a;hpb=95b2346e7dc4f74f2bc62b65dc1eede129b17275;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index e067cb835..93df59ccd 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -4540,7 +4540,7 @@ int64_t get_session_nb_packets_per_stream(const struct ltt_session *session,
 		}
 		cur_nb_packets++;
 	}
-	if (!cur_nb_packets) {
+	if (!cur_nb_packets && size_left != max_size) {
 		/* Not enough room to grab one packet of each stream, error. */
 		return -1;
 	}
@@ -4653,7 +4653,7 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 			snapshot_output->max_size);
 	if (nb_packets_per_stream < 0) {
 		ret_code = LTTNG_ERR_MAX_SIZE_INVALID;
-		goto error;
+		goto error_close_trace_chunk;
 	}
 
 	if (session->kernel_session) {
@@ -4661,7 +4661,7 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 				snapshot_kernel_consumer_output, session,
 				wait, nb_packets_per_stream);
 		if (ret_code != LTTNG_OK) {
-			goto error;
+			goto error_close_trace_chunk;
 		}
 	}
 
@@ -4670,10 +4670,10 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 				snapshot_ust_consumer_output, session,
 				wait, nb_packets_per_stream);
 		if (ret_code != LTTNG_OK) {
-			goto error;
+			goto error_close_trace_chunk;
 		}
 	}
-
+error_close_trace_chunk:
 	if (session_close_trace_chunk(
 			    session, session->current_trace_chunk, NULL, NULL)) {
 		/*
@@ -4907,6 +4907,12 @@ int cmd_rotate_session(struct ltt_session *session,
 		goto end;
 	}
 
+	/* Unsupported feature in lttng-modules before 2.8 (lack of sequence number). */
+	if (session->kernel_session && !kernel_supports_ring_buffer_packet_sequence_number()) {
+		cmd_ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE_KERNEL;
+		goto end;
+	}
+
 	if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
 		DBG("Refusing to launch a rotation; a rotation is already in progress for session %s",
 				session->name);