action list: missing renames from previous name "group"

[lttng-tools.git] / src / bin / lttng-sessiond / notification-thread-events.c

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 178b80fa2b59bbcc715ad23245924b7b0d48657a..c9847d032b372f2ad5b8cea23fc21a0679da5e3f 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2305,7 +2305,7 @@ static int handle_notification_thread_command_get_trigger(
 
        /* Not a fatal error if the trigger is not found. */
        get_trigger_info_for_log(trigger, &trigger_name, &trigger_owner_uid);
-       ERR("Failed to retrieve registered version of trigger: trigger name = '%s', trigger owner uid = %d",
+       DBG("Failed to retrieve registered version of trigger: trigger name = '%s', trigger owner uid = %d",
                        trigger_name, (int) trigger_owner_uid);
 
        ret = 0;
@@ -2487,7 +2487,7 @@ bool is_trigger_action_notify(const struct lttng_trigger *trigger)
        if (action_type == LTTNG_ACTION_TYPE_NOTIFY) {
                is_notify = true;
                goto end;
-       } else if (action_type != LTTNG_ACTION_TYPE_GROUP) {
+       } else if (action_type != LTTNG_ACTION_TYPE_LIST) {
                goto end;
        }
 
@@ -2603,7 +2603,7 @@ enum lttng_error_code setup_tracer_notifier(
                        trigger, &error_counter_index);
        if (error_accounting_status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
                if (error_accounting_status == EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_NO_INDEX_AVAILABLE) {
-                       DBG("Trigger group error accounting counter full.");
+                       DBG("Trigger list error accounting counter full.");
                        ret = LTTNG_ERR_EVENT_NOTIFIER_ERROR_ACCOUNTING_FULL;
                } else {
                        ERR("Error registering trigger for error accounting");
@@ -2729,9 +2729,8 @@ int handle_notification_thread_command_register_trigger(
                        trigger,
                        &trigger_ht_element->node_by_name_uid);
        if (node != &trigger_ht_element->node_by_name_uid) {
-               /* Not a fatal error, simply report it to the client. */
-               cds_lfht_del(state->triggers_ht, &trigger_ht_element->node);
-               *cmd_result = LTTNG_ERR_TRIGGER_EXISTS;
+               /* Internal error: add to triggers_ht should have failed. */
+               ret = -1;
                goto error_free_ht_element;
        }