X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=7af855eacb14e13b204730cdd2848f888c3bc352;hp=869215b8d920cb7d2a0bd33d22129c34024e199e;hb=343defc2671db532be8a9eed84907fd2e4044f0e;hpb=4dbe187595e8dc40516d6d9ce8a6a9c285f48a5e

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 869215b8d..7af855eac 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:
@@ -2699,7 +2715,8 @@ int cmd_start_trace(struct ltt_session *session)
 			 * was produced as the session was stopped, so the
 			 * rotation should happen on reception of the command.
 			 */
-			ret = cmd_rotate_session(session, NULL, true);
+			ret = cmd_rotate_session(session, NULL, true,
+					LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
@@ -3313,7 +3330,8 @@ int cmd_destroy_session(struct ltt_session *session,
 		 * Perform a last rotation on destruction if rotations have
 		 * occurred during the session's lifetime.
 		 */
-		ret = cmd_rotate_session(session, NULL, false);
+		ret = cmd_rotate_session(session, NULL, false,
+			LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
 		if (ret != LTTNG_OK) {
 			ERR("Failed to perform an implicit rotation as part of the destruction of session \"%s\": %s",
 					session->name, lttng_strerror(-ret));
@@ -3332,7 +3350,8 @@ int cmd_destroy_session(struct ltt_session *session,
 		 * emitted and no renaming of the current trace chunk takes
 		 * place.
 		 */
-		ret = cmd_rotate_session(session, NULL, true);
+		ret = cmd_rotate_session(session, NULL, true,
+			LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION);
 		if (ret != LTTNG_OK) {
 			ERR("Failed to perform a quiet rotation as part of the destruction of session \"%s\": %s",
 					session->name, lttng_strerror(-ret));
@@ -4691,8 +4710,8 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 		}
 	}
 
-	if (session_close_trace_chunk(
-			    session, session->current_trace_chunk, NULL, NULL)) {
+	if (session_close_trace_chunk(session, session->current_trace_chunk,
+			LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION, NULL)) {
 		/*
 		 * Don't goto end; make sure the chunk is closed for the session
 		 * to allow future snapshots.
@@ -4886,7 +4905,8 @@ int cmd_set_session_shm_path(struct ltt_session *session,
  */
 int cmd_rotate_session(struct ltt_session *session,
 		struct lttng_rotate_session_return *rotate_return,
-		bool quiet_rotation)
+		bool quiet_rotation,
+		enum lttng_trace_chunk_command_type command)
 {
 	int ret;
 	uint64_t ongoing_rotation_chunk_id;
@@ -5006,11 +5026,7 @@ int cmd_rotate_session(struct ltt_session *session,
 	assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
 
 	ret = session_close_trace_chunk(session, chunk_being_archived,
-			quiet_rotation ?
-					NULL :
-					&((enum lttng_trace_chunk_command_type){
-							LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED}),
-			session->last_chunk_path);
+		command, session->last_chunk_path);
 	if (ret) {
 		cmd_ret = LTTNG_ERR_CLOSE_TRACE_CHUNK_FAIL_CONSUMER;
 		goto error;