Dedicated error message when relay does not support rotations

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

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 924ac92316bf0c9add8a79e15b7087aa421a6c44..e0a8db9b2cc13a2b5c77407e0b14938fa565a587 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2953,7 +2953,8 @@ error:
  *
  * Called with session lock held.
  */
-int cmd_destroy_session(struct ltt_session *session, int wpipe)
+int cmd_destroy_session(struct ltt_session *session, int wpipe,
+               struct notification_thread_handle *notification_thread_handle)
 {
        int ret;
        struct ltt_ust_session *usess;
@@ -2975,6 +2976,11 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe)
                sessiond_rotate_timer_stop(session);
        }
 
+       if (session->rotate_size) {
+               unsubscribe_session_consumed_size_rotation(session, notification_thread_handle);
+               session->rotate_size = 0;
+       }
+
        /*
         * The rename of the current chunk is performed at stop, but if we rotated
         * the session after the previous stop command, we need to rename the
@@ -4377,7 +4383,7 @@ int cmd_rotate_session(struct ltt_session *session,
        int ret;
        size_t strf_ret;
        struct tm *timeinfo;
-       char datetime[16];
+       char datetime[21];
        time_t now;
        bool ust_active = false;
 
@@ -4400,7 +4406,7 @@ int cmd_rotate_session(struct ltt_session *session,
        if (session->consumer->type == CONSUMER_DST_NET &&
                        (session->consumer->relay_major_version == 2 &&
                        session->consumer->relay_minor_version < 11)) {
-               ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE;
+               ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE_RELAY;
                goto end;
        }
 
@@ -4479,7 +4485,7 @@ int cmd_rotate_session(struct ltt_session *session,
                ret = -LTTNG_ERR_UNK;
                goto end;
        }
-       strf_ret = strftime(datetime, sizeof(datetime), "%Y%m%d-%H%M%S",
+       strf_ret = strftime(datetime, sizeof(datetime), "%Y%m%dT%H%M%S%z",
                        timeinfo);
        if (!strf_ret) {
                ERR("Failed to format local time timestamp in rotate session command");
@@ -4558,9 +4564,12 @@ int cmd_rotate_session(struct ltt_session *session,
                ret = domain_mkdir(session->ust_session->consumer, session,
                                session->ust_session->uid,
                                session->ust_session->gid);
+               if (ret) {
+                       ret = -LTTNG_ERR_CREATE_DIR_FAIL;
+                       goto end;
+               }
                ret = ust_app_rotate_session(session, &ust_active);
                if (ret != LTTNG_OK) {
-                       ret = -LTTNG_ERR_CREATE_DIR_FAIL;
                        goto end;
                }
                /*
@@ -4659,7 +4668,8 @@ end:
  * Return 0 on success or else an LTTNG_ERR code.
  */
 int cmd_rotation_set_schedule(struct ltt_session *session,
-               uint64_t timer_us, uint64_t size)
+               uint64_t timer_us, uint64_t size,
+               struct notification_thread_handle *notification_thread_handle)
 {
        int ret;
 
@@ -4683,6 +4693,14 @@ int cmd_rotation_set_schedule(struct ltt_session *session,
                goto end;
        }
 
+       if (size && size != -1ULL && session->rotate_size) {
+               ret = LTTNG_ERR_ROTATION_SIZE_SET;
+               goto end;
+       } else if (size == -1ULL && !session->rotate_size) {
+               ret = LTTNG_ERR_ROTATION_NO_SIZE_SET;
+               goto end;
+       }
+
        if (timer_us && !session->rotate_timer_period) {
                if (timer_us > UINT_MAX) {
                        ret = LTTNG_ERR_INVALID;
@@ -4707,6 +4725,27 @@ int cmd_rotation_set_schedule(struct ltt_session *session,
                session->rotate_timer_period = 0;
        }
 
+       if (size > 0) {
+               if (size == -1ULL) {
+                       ret = unsubscribe_session_consumed_size_rotation(session,
+                                       notification_thread_handle);
+                       if (ret) {
+                               ret = LTTNG_ERR_UNK;
+                               goto end;
+                       }
+                       session->rotate_size = 0;
+               } else {
+                       ret = subscribe_session_consumed_size_rotation(session,
+                                       size, notification_thread_handle);
+                       if (ret) {
+                               PERROR("Subscribe to session usage");
+                               ret = LTTNG_ERR_UNK;
+                               goto end;
+                       }
+                       session->rotate_size = size;
+               }
+       }
+
        ret = LTTNG_OK;
 
        goto end;