X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.cpp;h=032ac11a08de74d0f0657b67086e2bfc7afc99c4;hb=d50d200af8d01f4b58a14e384cabd46b1afb4817;hp=8c2374535195cc0cc59531a4d02133b3930c5e56;hpb=635e0160bfe2f0ef440ae4990bae7eed96454ae1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/action-executor.cpp b/src/bin/lttng-sessiond/action-executor.cpp
index 8c2374535..032ac11a0 100644
--- a/src/bin/lttng-sessiond/action-executor.cpp
+++ b/src/bin/lttng-sessiond/action-executor.cpp
@@ -301,40 +301,32 @@ static int action_executor_start_session_handler(
 	 * existed. If not skip the action altogether.
 	 */
 	if (!item->context.session_id.is_set) {
-		DBG("Session `%s` was not present at the moment the work item was enqueued for %s` action of trigger `%s`",
+		DBG("Session `%s` was not present at the moment the work item was enqueued for `%s` action of trigger `%s`",
 				session_name, get_action_name(action),
 				get_trigger_name(work_item->trigger));
 		lttng_action_increase_execution_failure_count(action);
-		ret = 0;
 		goto end;
 	}
 
 	session_lock_list();
-	session = session_find_by_name(session_name);
+	session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id));
 	if (!session) {
 		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`",
 				session_name, get_action_name(action),
 				get_trigger_name(work_item->trigger));
+		lttng_action_increase_execution_failure_count(action);
 		goto error_unlock_list;
 	}
 
-	/*
-	 * Check if the session id is the same as when the work item was
-	 * enqueued.
-	 */
-	if (session->id != LTTNG_OPTIONAL_GET(item->context.session_id)) {
-		DBG("Session id for session `%s` (id: %" PRIu64
-				" is not the same that was sampled (id: %" PRIu64
-				" at the moment the work item was enqueued for %s` action of trigger `%s`",
-				session_name, session->id,
-				LTTNG_OPTIONAL_GET(item->context.session_id),
+	session_lock(session);
+	if (session->destroyed) {
+		DBG("Session `%s` with id = %" PRIu64 " is flagged as destroyed. Skipping: action = `%s`, trigger = `%s`",
+				session->name, session->id,
 				get_action_name(action),
 				get_trigger_name(work_item->trigger));
-		ret = 0;
-		goto error_put_session;
+		goto error_unlock_session;
 	}
 
-	session_lock(session);
 	if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
 		goto error_unlock_session;
 	}
@@ -359,7 +351,6 @@ static int action_executor_start_session_handler(
 
 error_unlock_session:
 	session_unlock(session);
-error_put_session:
 	session_put(session);
 error_unlock_list:
 	session_unlock_list();
@@ -393,16 +384,15 @@ static int action_executor_stop_session_handler(
 	 * existed. If not, skip the action altogether.
 	 */
 	if (!item->context.session_id.is_set) {
-		DBG("Session `%s` was not present at the moment the work item was enqueued for %s` action of trigger `%s`",
+		DBG("Session `%s` was not present at the moment the work item was enqueued for `%s` action of trigger `%s`",
 				session_name, get_action_name(action),
 				get_trigger_name(work_item->trigger));
 		lttng_action_increase_execution_failure_count(action);
-		ret = 0;
 		goto end;
 	}
 
 	session_lock_list();
-	session = session_find_by_name(session_name);
+	session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id));
 	if (!session) {
 		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`",
 				session_name, get_action_name(action),
@@ -411,23 +401,15 @@ static int action_executor_stop_session_handler(
 		goto error_unlock_list;
 	}
 
-	/*
-	 * Check if the session id is the same as when the work item was
-	 * enqueued
-	 */
-	if (session->id != LTTNG_OPTIONAL_GET(item->context.session_id)) {
-		DBG("Session id for session `%s` (id: %" PRIu64
-				" is not the same that was sampled (id: %" PRIu64
-				" at the moment the work item was enqueued for %s` action of trigger `%s`",
-				session_name, session->id,
-				LTTNG_OPTIONAL_GET(item->context.session_id),
+	session_lock(session);
+	if (session->destroyed) {
+		DBG("Session `%s` with id = %" PRIu64 " is flagged as destroyed. Skipping: action = `%s`, trigger = `%s`",
+				session->name, session->id,
 				get_action_name(action),
 				get_trigger_name(work_item->trigger));
-		ret = 0;
-		goto error_put_session;
+		goto error_unlock_session;
 	}
 
-	session_lock(session);
 	if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
 		goto error_unlock_session;
 	}
@@ -452,7 +434,6 @@ static int action_executor_stop_session_handler(
 
 error_unlock_session:
 	session_unlock(session);
-error_put_session:
 	session_put(session);
 error_unlock_list:
 	session_unlock_list();
@@ -486,16 +467,15 @@ static int action_executor_rotate_session_handler(
 	 * existed. If not, skip the action altogether.
 	 */
 	if (!item->context.session_id.is_set) {
-		DBG("Session `%s` was not present at the moment the work item was enqueued for %s` action of trigger `%s`",
+		DBG("Session `%s` was not present at the moment the work item was enqueued for `%s` action of trigger `%s`",
 				session_name, get_action_name(action),
 				get_trigger_name(work_item->trigger));
 		lttng_action_increase_execution_failure_count(action);
-		ret = 0;
 		goto end;
 	}
 
 	session_lock_list();
-	session = session_find_by_name(session_name);
+	session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id));
 	if (!session) {
 		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`",
 				session_name, get_action_name(action),
@@ -504,23 +484,15 @@ static int action_executor_rotate_session_handler(
 		goto error_unlock_list;
 	}
 
-	/*
-	 * Check if the session id is the same as when the work item was
-	 * enqueued.
-	 */
-	if (session->id != LTTNG_OPTIONAL_GET(item->context.session_id)) {
-		DBG("Session id for session `%s` (id: %" PRIu64
-		    " is not the same that was sampled (id: %" PRIu64
-		    " at the moment the work item was enqueued for %s` action of trigger `%s`",
-				session_name, session->id,
-				LTTNG_OPTIONAL_GET(item->context.session_id),
+	session_lock(session);
+	if (session->destroyed) {
+		DBG("Session `%s` with id = %" PRIu64 " is flagged as destroyed. Skipping: action = `%s`, trigger = `%s`",
+				session->name, session->id,
 				get_action_name(action),
 				get_trigger_name(work_item->trigger));
-		ret = 0;
-		goto error_put_session;
+		goto error_unlock_session;
 	}
 
-	session_lock(session);
 	if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
 		goto error_unlock_session;
 	}
@@ -552,7 +524,6 @@ static int action_executor_rotate_session_handler(
 
 error_unlock_session:
 	session_unlock(session);
-error_put_session:
 	session_put(session);
 error_unlock_list:
 	session_unlock_list();
@@ -582,11 +553,10 @@ static int action_executor_snapshot_session_handler(
 	 * existed. If not, skip the action altogether.
 	 */
 	if (!item->context.session_id.is_set) {
-		DBG("Session was not present at the moment the work item was enqueued for %s` action of trigger `%s`",
+		DBG("Session was not present at the moment the work item was enqueued for `%s` action of trigger `%s`",
 				get_action_name(action),
 				get_trigger_name(work_item->trigger));
 		lttng_action_increase_execution_failure_count(action);
-		ret = 0;
 		goto end;
 	}
 
@@ -610,7 +580,7 @@ static int action_executor_snapshot_session_handler(
 	}
 
 	session_lock_list();
-	session = session_find_by_name(session_name);
+	session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id));
 	if (!session) {
 		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`",
 				session_name, get_action_name(action),
@@ -619,23 +589,15 @@ static int action_executor_snapshot_session_handler(
 		goto error_unlock_list;
 	}
 
-	/*
-	 * Check if the session id is the same as when the work item was
-	 * enqueued.
-	 */
-	if (session->id != LTTNG_OPTIONAL_GET(item->context.session_id)) {
-		DBG("Session id for session `%s` (id: %" PRIu64
-		    " is not the same that was sampled (id: %" PRIu64
-		    " at the moment the work item was enqueued for %s` action of trigger `%s`",
-				session_name, session->id,
-				LTTNG_OPTIONAL_GET(item->context.session_id),
+	session_lock(session);
+	if (session->destroyed) {
+		DBG("Session `%s` with id = %" PRIu64 " is flagged as destroyed. Skipping: action = `%s`, trigger = `%s`",
+				session->name, session->id,
 				get_action_name(action),
 				get_trigger_name(work_item->trigger));
-		ret = 0;
-		goto error_put_session;
+		goto error_unlock_session;
 	}
 
-	session_lock(session);
 	if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
 		goto error_unlock_session;
 	}
@@ -656,7 +618,6 @@ static int action_executor_snapshot_session_handler(
 
 error_unlock_session:
 	session_unlock(session);
-error_put_session:
 	session_put(session);
 error_unlock_list:
 	session_unlock_list();
@@ -791,7 +752,7 @@ static void *action_executor_thread(void *_data)
 					work_item->trigger, &trigger_owner_uid);
 			LTTNG_ASSERT(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
-			DBG("Work item skipped since the associated trigger is no longer registered: work item id = %" PRIu64 ", trigger name = '%s', trigger owner uid = %d",
+			DBG("Work item skipped since the associated trigger is no longer registered: work item id = %" PRIu64 ", trigger name = `%s`, trigger owner uid = %d",
 					work_item->id, trigger_name,
 					(int) trigger_owner_uid);
 			ret = 0;
@@ -924,7 +885,7 @@ enum action_executor_status action_executor_enqueue_trigger(
 
 	work_item = (action_work_item *) zmalloc(sizeof(*work_item));
 	if (!work_item) {
-		PERROR("Failed to allocate action executor work item: trigger name = '%s'",
+		PERROR("Failed to allocate action executor work item: trigger name = `%s`",
 				get_trigger_name(trigger));
 		executor_status = ACTION_EXECUTOR_STATUS_ERROR;
 		goto error_unlock;