Fix: rotation error may leave session in "ONGOING" state

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

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index a5b9a427835e8a580cb4faaf658b53247091a888..abf61e898ceb8e6ef037a53e6729020397e5194b 100644 (file)
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -33,6 +33,7 @@
 #include "session.h"
 #include "utils.h"
 #include "trace-ust.h"
+#include "timer.h"
 
 /*
  * NOTES:
@@ -520,11 +521,12 @@ int session_create(char *name, uid_t uid, gid_t gid)
                goto error;
        }
 
-       new_session->rotate_pending = false;
+       new_session->rotation_pending_local = false;
+       new_session->rotation_pending_relay = false;
        new_session->rotation_state = LTTNG_ROTATION_STATE_NO_ROTATION;
-       new_session->rotate_pending_relay = false;
-       new_session->rotate_relay_pending_timer_enabled = false;
-       new_session->rotate_timer = false;
+
+       new_session->rotation_pending_check_timer_enabled = false;
+       new_session->rotation_schedule_timer_enabled = false;
 
        /* Add new session to the session list */
        session_lock_list();
@@ -569,3 +571,36 @@ int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid)
                return 1;
        }
 }
+
+/*
+ * Set a session's rotation state and reset all associated state.
+ *
+ * This function resets the rotation state (check timers, pending
+ * flags, etc.) and sets the result of the last rotation. The result
+ * can be queries by a liblttng-ctl client.
+ *
+ * Be careful of the result passed to this function. For instance,
+ * on failure to launch a rotation, a client will expect the rotation
+ * state to be set to "NO_ROTATION". If an error occured while the
+ * rotation was "ONGOING", result should be set to "ERROR", which will
+ * allow a client to report it.
+ *
+ * Must be called with the session and session_list locks held.
+ */
+int session_reset_rotation_state(struct ltt_session *session,
+               enum lttng_rotation_state result)
+{
+       int ret = 0;
+
+       ASSERT_LOCKED(ltt_session_list.lock);
+       ASSERT_LOCKED(session->lock);
+
+       session->rotation_pending_local = false;
+       session->rotation_pending_relay = false;
+       session->rotated_after_last_stop = false;
+       session->rotation_state = result;
+       if (session->rotation_pending_check_timer_enabled) {
+               ret = timer_session_rotation_pending_check_stop(session);
+       }
+       return ret;
+}