Fix: sessiond: use of null session when session is not found

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

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index f07672c220158d285325db3c57207edfed525f08..5e6042e85671b88ad0b12dd5ea848b51b84529c2 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -25,6 +25,8 @@
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <lttng/notification/channel-internal.h>
 #include <lttng/rotate-internal.h>
+#include <lttng/location-internal.h>
+#include <lttng/condition/condition-internal.h>
 
 #include "rotation-thread.h"
 #include "lttng-sessiond.h"
@@ -478,7 +480,6 @@ int check_session_rotation_pending(struct ltt_session *session,
 
        if (!session->quiet_rotation) {
                location = session_get_trace_archive_location(session);
-               /* Ownership of location is transferred. */
                ret = notification_thread_command_session_rotation_completed(
                                notification_thread_handle,
                                session->name,
@@ -486,6 +487,7 @@ int check_session_rotation_pending(struct ltt_session *session,
                                session->gid,
                                session->last_archived_chunk_id.value,
                                location);
+               lttng_trace_archive_location_put(location);
                if (ret != LTTNG_OK) {
                        ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
                                        session->name);
@@ -585,8 +587,7 @@ int handle_job_queue(struct rotation_thread_handle *handle,
                session_lock_list();
                session = job->session;
                if (!session) {
-                       DBG("[rotation-thread] Session \"%s\" not found",
-                                       session->name);
+                       DBG("[rotation-thread] Session not found");
                        /*
                         * This is a non-fatal error, and we cannot report it to
                         * the user (timer), so just print the error and
@@ -598,7 +599,6 @@ int handle_job_queue(struct rotation_thread_handle *handle,
                         * already been queued before it was destroyed.
                         */
                        free(job);
-                       session_put(session);
                        session_unlock_list();
                        continue;
                }
@@ -661,10 +661,14 @@ int handle_condition(const struct lttng_condition *condition,
        session_lock_list();
        session = session_find_by_name(condition_session_name);
        if (!session) {
-               ret = -1;
-               session_unlock_list();
-               ERR("[rotation-thread] Session \"%s\" not found",
+               DBG("[rotation-thread] Failed to find session while handling notification: session name = `%s`",
                                condition_session_name);
+               /*
+                * Not a fatal error: a session can be destroyed before we get
+                * the chance to handle the notification.
+                */
+               ret = 0;
+               session_unlock_list();
                goto end;
        }
        session_lock(session);