X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=1977353e9f6bec04c7fc74fc8eaaf84584bb017a;hb=eacb7b6f2773556e31efb5e5d53d888c004b8f2f;hp=e067cb835e1a2739dfa35f83ce32a3d3c59b586a;hpb=aa997ea33777896c17c9f46732e90dd4a1a9188c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index e067cb835..1977353e9 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -998,6 +998,8 @@ static enum lttng_error_code create_connect_relayd(struct lttng_uri *uri,
 
 	/* Create socket for control stream. */
 	if (uri->stype == LTTNG_STREAM_CONTROL) {
+		uint64_t result_flags;
+
 		DBG3("Creating relayd stream socket from URI");
 
 		/* Check relayd version */
@@ -1012,6 +1014,16 @@ static enum lttng_error_code create_connect_relayd(struct lttng_uri *uri,
 		}
 		consumer->relay_major_version = rsock->major;
 		consumer->relay_minor_version = rsock->minor;
+		ret = relayd_get_configuration(rsock, 0,
+				&result_flags);
+		if (ret < 0) {
+			ERR("Unable to get relayd configuration");
+			status = LTTNG_ERR_RELAYD_CONNECT_FAIL;
+			goto close_sock;
+		}
+		if (result_flags & LTTCOMM_RELAYD_CONFIGURATION_FLAG_CLEAR_ALLOWED) {
+			consumer->relay_allows_clear = true;
+		}
 	} else if (uri->stype == LTTNG_STREAM_DATA) {
 		DBG3("Creating relayd data socket from URI");
 	} else {
@@ -1224,6 +1236,8 @@ int cmd_setup_relayd(struct ltt_session *session)
 			usess->consumer->relay_major_version;
 		session->consumer->relay_minor_version =
 			usess->consumer->relay_minor_version;
+		session->consumer->relay_allows_clear =
+			usess->consumer->relay_allows_clear;
 	}
 
 	if (ksess && ksess->consumer && ksess->consumer->type == CONSUMER_DST_NET
@@ -1250,6 +1264,8 @@ int cmd_setup_relayd(struct ltt_session *session)
 			ksess->consumer->relay_major_version;
 		session->consumer->relay_minor_version =
 			ksess->consumer->relay_minor_version;
+		session->consumer->relay_allows_clear =
+			ksess->consumer->relay_allows_clear;
 	}
 
 error:
@@ -1260,7 +1276,7 @@ error:
 /*
  * Start a kernel session by opening all necessary streams.
  */
-static int start_kernel_session(struct ltt_kernel_session *ksess)
+int start_kernel_session(struct ltt_kernel_session *ksess)
 {
 	int ret;
 	struct ltt_kernel_channel *kchan;
@@ -1322,6 +1338,53 @@ error:
 	return ret;
 }
 
+int stop_kernel_session(struct ltt_kernel_session *ksess)
+{
+	struct ltt_kernel_channel *kchan;
+	bool error_occurred = false;
+	int ret;
+
+	if (!ksess || !ksess->active) {
+		return LTTNG_OK;
+	}
+	DBG("Stopping kernel tracing");
+
+	ret = kernel_stop_session(ksess);
+	if (ret < 0) {
+		ret = LTTNG_ERR_KERN_STOP_FAIL;
+		goto error;
+	}
+
+	kernel_wait_quiescent();
+
+	/* Flush metadata after stopping (if exists) */
+	if (ksess->metadata_stream_fd >= 0) {
+		ret = kernel_metadata_flush_buffer(ksess->metadata_stream_fd);
+		if (ret < 0) {
+			ERR("Kernel metadata flush failed");
+			error_occurred = true;
+		}
+	}
+
+	/* Flush all buffers after stopping */
+	cds_list_for_each_entry(kchan, &ksess->channel_list.head, list) {
+		ret = kernel_flush_buffer(kchan);
+		if (ret < 0) {
+			ERR("Kernel flush buffer error");
+			error_occurred = true;
+		}
+	}
+
+	ksess->active = 0;
+	if (error_occurred) {
+		ret = LTTNG_ERR_UNK;
+	} else {
+		ret = LTTNG_OK;
+	}
+error:
+	return ret;
+}
+
 /*
  * Command LTTNG_DISABLE_CHANNEL processed by the client thread.
  */
@@ -2716,14 +2779,12 @@ error:
 int cmd_stop_trace(struct ltt_session *session)
 {
 	int ret;
-	struct ltt_kernel_channel *kchan;
 	struct ltt_kernel_session *ksession;
 	struct ltt_ust_session *usess;
-	bool error_occurred = false;
 
 	assert(session);
 
-	DBG("Begin stop session %s (id %" PRIu64 ")", session->name, session->id);
+	DBG("Begin stop session \"%s\" (id %" PRIu64 ")", session->name, session->id);
 	/* Short cut */
 	ksession = session->kernel_session;
 	usess = session->ust_session;
@@ -2734,39 +2795,9 @@ int cmd_stop_trace(struct ltt_session *session)
 		goto error;
 	}
 
-	/* Kernel tracer */
-	if (ksession && ksession->active) {
-		DBG("Stop kernel tracing");
-
-		ret = kernel_stop_session(ksession);
-		if (ret < 0) {
-			ret = LTTNG_ERR_KERN_STOP_FAIL;
-			goto error;
-		}
-
-		kernel_wait_quiescent();
-
-		/* Flush metadata after stopping (if exists) */
-		if (ksession->metadata_stream_fd >= 0) {
-			ret = kernel_metadata_flush_buffer(ksession->metadata_stream_fd);
-			if (ret < 0) {
-				ERR("Kernel metadata flush failed");
-				error_occurred = true;
-			}
-		}
-
-		/* Flush all buffers after stopping */
-		cds_list_for_each_entry(kchan, &ksession->channel_list.head, list) {
-			ret = kernel_flush_buffer(kchan);
-			if (ret < 0) {
-				ERR("Kernel flush buffer error");
-				error_occurred = true;
-			}
-		}
-
-		ksession->active = 0;
-		DBG("Kernel session stopped %s (id %" PRIu64 ")", session->name,
-				session->id);
+	ret = stop_kernel_session(ksession);
+	if (ret != LTTNG_OK) {
+		goto error;
 	}
 
 	if (usess && usess->active) {
@@ -2777,9 +2808,11 @@ int cmd_stop_trace(struct ltt_session *session)
 		}
 	}
 
+	DBG("Completed stop session \"%s\" (id %" PRIu64 ")", session->name,
+			session->id);
 	/* Flag inactive after a successful stop. */
 	session->active = 0;
-	ret = !error_occurred ? LTTNG_OK : LTTNG_ERR_UNK;
+	ret = LTTNG_OK;
 
 error:
 	return ret;
@@ -4907,6 +4940,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);