From 75e540c60661f7e384e35289fd13a72bc4e015e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 21 Apr 2021 00:41:09 -0400 Subject: [PATCH] Fix: sessiond: triggers: failure to insert trigger is fatal MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Inserting a trigger by name/owner should succeed if it could be added to the top-level triggers_ht. Signed-off-by: Jérémie Galarneau Change-Id: I46518b86b34cb13074723b4f2bef38026d898700 --- src/bin/lttng-sessiond/notification-thread-events.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c index f13e22a17..c9c21bc72 100644 --- a/src/bin/lttng-sessiond/notification-thread-events.c +++ b/src/bin/lttng-sessiond/notification-thread-events.c @@ -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; } -- 2.34.1