X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=0330186209268cb63b49175e08d4a4102d07e96a;hb=ac4c07212ead3c601918c21b21eeaace48a95593;hp=507274f35568bc421887ebfb88674d476297af1d;hpb=f859080e7a2b2721e88055b28416c62a2a6313d4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 507274f35..033018620 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2684,12 +2684,6 @@ int cmd_start_trace(struct ltt_session *session)
 
 	/* Flag session that trace should start automatically */
 	if (usess) {
-		/*
-		 * Even though the start trace might fail, flag this session active so
-		 * other application coming in are started by default.
-		 */
-		usess->active = 1;
-
 		ret = ust_app_start_trace_all(usess);
 		if (ret < 0) {
 			ret = LTTNG_ERR_UST_START_FAIL;
@@ -2781,12 +2775,6 @@ int cmd_stop_trace(struct ltt_session *session)
 	}
 
 	if (usess && usess->active) {
-		/*
-		 * Even though the stop trace might fail, flag this session inactive so
-		 * other application coming in are not started by default.
-		 */
-		usess->active = 0;
-
 		ret = ust_app_stop_trace_all(usess);
 		if (ret < 0) {
 			ret = LTTNG_ERR_UST_STOP_FAIL;
@@ -4191,10 +4179,13 @@ static enum lttng_error_code record_ust_snapshot(struct ltt_ust_session *usess,
 		goto error_snapshot;
 	}
 
+	goto end;
+
 error_snapshot:
 	/* Clean up copied sockets so this output can use some other later on. */
 	consumer_destroy_output_sockets(output->consumer);
 error:
+end:
 	return status;
 }
 
@@ -4508,8 +4499,7 @@ int cmd_rotate_session(struct ltt_session *session,
 		goto end;
 	}
 
-	if (session->live_timer || session->snapshot_mode ||
-			!session->output_traces) {
+	if (session->live_timer || !session->output_traces) {
 		cmd_ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE;
 		goto end;
 	}
@@ -4858,8 +4848,7 @@ int cmd_rotation_set_schedule(struct ltt_session *session,
 
 	DBG("Cmd rotate set schedule session %s", session->name);
 
-	if (session->live_timer || session->snapshot_mode ||
-			!session->output_traces) {
+	if (session->live_timer || !session->output_traces) {
 		DBG("Failing ROTATION_SET_SCHEDULE command as the rotation feature is not available for this session");
 		ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE;
 		goto end;