Fix: unchecked return value of cds_lfht_destroy

[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 9f15ed06edacbae130cef7ac9e4c0c7793ecee87..24ab0c8033fd715c829f036c67a2c3e891923c5d 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -261,8 +261,11 @@ error:
 static
 void fini_thread_state(struct rotation_thread_state *state)
 {
+       int ret;
+
        lttng_poll_clean(&state->events);
-       cds_lfht_destroy(channel_pending_rotate_ht, NULL);
+       ret = cds_lfht_destroy(channel_pending_rotate_ht, NULL);
+       assert(!ret);
        if (rotate_notification_channel) {
                lttng_notification_channel_destroy(rotate_notification_channel);
        }
@@ -395,7 +398,6 @@ int handle_channel_rotation_pipe(int fd, uint32_t revents,
                        goto end_unlock_session;
                }
                session->rotate_pending = false;
-               session->rotation_state = LTTNG_ROTATION_STATE_COMPLETED;
                session->last_chunk_start_ts = session->current_chunk_start_ts;
                if (session->rotate_pending_relay) {
                        ret = sessiond_timer_rotate_pending_start(
@@ -406,6 +408,8 @@ int handle_channel_rotation_pipe(int fd, uint32_t revents,
                                ret = -1;
                                goto end_unlock_session;
                        }
+               } else {
+                       session->rotation_state = LTTNG_ROTATION_STATE_COMPLETED;
                }
                DBG("Rotation completed for session %s", session->name);
        }
@@ -432,7 +436,7 @@ int rotate_pending_relay_timer(struct ltt_session *session)
 
        DBG("[rotation-thread] Check rotate pending on session %" PRIu64,
                        session->id);
-       ret = relay_rotate_pending(session, session->rotate_count - 1);
+       ret = relay_rotate_pending(session, session->current_archive_id - 1);
        if (ret < 0) {
                ERR("[rotation-thread] Check relay rotate pending");
                goto end;
@@ -445,6 +449,7 @@ int rotate_pending_relay_timer(struct ltt_session *session)
                 * rotations can start now.
                 */
                session->rotate_pending_relay = false;
+               session->rotation_state = LTTNG_ROTATION_STATE_COMPLETED;
        } else if (ret == 1) {
                DBG("[rotation-thread] Rotation still pending on the relay for "
                                "session %" PRIu64, session->id);
@@ -680,11 +685,25 @@ int handle_notification_channel(int fd, uint32_t revents,
                struct rotation_thread_state *state)
 {
        int ret;
-       struct lttng_notification *notification;
+       bool notification_pending;
+       struct lttng_notification *notification = NULL;
        enum lttng_notification_channel_status status;
        const struct lttng_evaluation *notification_evaluation;
        const struct lttng_condition *notification_condition;
 
+       status = lttng_notification_channel_has_pending_notification(
+                       rotate_notification_channel, &notification_pending);
+       if (status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
+               ERR("[rotation-thread ]Error occured while checking for pending notification");
+               ret = -1;
+               goto end;
+       }
+
+       if (!notification_pending) {
+               ret = 0;
+               goto end;
+       }
+
        /* Receive the next notification. */
        status = lttng_notification_channel_get_next_notification(
                        rotate_notification_channel,
@@ -716,11 +735,6 @@ int handle_notification_channel(int fd, uint32_t revents,
 
 end:
        lttng_notification_destroy(notification);
-       if (ret != 0) {
-               goto end;
-       }
-
-
        return ret;
 }
 
@@ -794,7 +808,7 @@ void *thread_rotation(void *data)
                                ret = handle_channel_rotation_pipe(fd,
                                                revents, handle, &state);
                                if (ret) {
-                                       ERR("[rotation-thread] Handle channel rotation pipe");
+                                       ERR("[rotation-thread] Failed to handle channel rotation pipe");
                                        goto error;
                                }
                        } else if (fd == rotate_notification_channel->socket) {