X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=534f191a8b447d0763d56ec62d4aba42a0c3af70;hp=5377ad8ee7ea44fced57db158ae85d9d8ddec044;hb=dd73d57bb95fae31161ca0781108d166082a06f5;hpb=d68c9a04537b683991a7355b812b0af954008cf1 diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index 5377ad8ee..534f191a8 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -2579,6 +2579,16 @@ int cmd_start_trace(struct ltt_session *session) */ session->rotated_after_last_stop = false; + if (session->rotate_timer_period) { + ret = sessiond_rotate_timer_start(session, + session->rotate_timer_period); + if (ret < 0) { + ERR("Failed to enable rotate timer"); + ret = LTTNG_ERR_UNK; + goto error; + } + } + ret = LTTNG_OK; error: @@ -2655,6 +2665,10 @@ int cmd_stop_trace(struct ltt_session *session) sessiond_timer_rotate_pending_stop(session); } + if (session->rotate_timer_enabled) { + sessiond_rotate_timer_stop(session); + } + if (session->rotate_count > 0 && !session->rotate_pending) { ret = rename_active_chunk(session); if (ret) { @@ -2939,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; @@ -2957,6 +2972,15 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe) sessiond_timer_rotate_pending_stop(session); } + if (session->rotate_timer_enabled) { + 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 @@ -4359,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; @@ -4382,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; } @@ -4461,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"); @@ -4540,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; } /* @@ -4570,7 +4597,7 @@ int cmd_rotate_session(struct ltt_session *session, rotate_return->rotation_id = session->rotate_count; } - DBG("Cmd rotate session %s, rotate_id %" PRIu64 " completed", session->name, + DBG("Cmd rotate session %s, rotate_id %" PRIu64 " sent", session->name, session->rotate_count); ret = LTTNG_OK; @@ -4608,16 +4635,59 @@ int cmd_rotate_get_info(struct ltt_session *session, rotation_id, session->name); break; case LTTNG_ROTATION_STATE_COMPLETED: - ret = lttng_strncpy(info_return->path, + { + char *current_tracing_path_reply; + size_t current_tracing_path_reply_len; + + switch (session_get_consumer_destination_type(session)) { + case CONSUMER_DST_LOCAL: + current_tracing_path_reply = + info_return->location.local.absolute_path; + current_tracing_path_reply_len = + sizeof(info_return->location.local.absolute_path); + info_return->location_type = + (uint8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL; + break; + case CONSUMER_DST_NET: + current_tracing_path_reply = + info_return->location.relay.relative_path; + current_tracing_path_reply_len = + sizeof(info_return->location.relay.relative_path); + /* Currently the only supported relay protocol. */ + info_return->location.relay.protocol = + (uint8_t) LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP; + + ret = lttng_strncpy(info_return->location.relay.host, + session_get_net_consumer_hostname(session), + sizeof(info_return->location.relay.host)); + if (ret) { + ERR("Failed to host name to rotate_get_info reply"); + info_return->status = LTTNG_ROTATION_STATUS_ERROR; + ret = -LTTNG_ERR_UNK; + goto end; + } + + session_get_net_consumer_ports(session, + &info_return->location.relay.ports.control, + &info_return->location.relay.ports.data); + info_return->location_type = + (uint8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY; + break; + default: + abort(); + } + ret = lttng_strncpy(current_tracing_path_reply, session->rotation_chunk.current_rotate_path, - sizeof(info_return->path)); + current_tracing_path_reply_len); if (ret) { - ERR("Failed to copy active tracing path to rotate_get_info reply"); + ERR("Failed to copy current tracing path to rotate_get_info reply"); info_return->status = LTTNG_ROTATION_STATUS_ERROR; ret = -LTTNG_ERR_UNK; goto end; } + break; + } case LTTNG_ROTATION_STATE_ERROR: DBG("Reporting that an error occurred during rotation %" PRIu64 " of session %s", rotation_id, session->name); @@ -4632,6 +4702,101 @@ end: return ret; } +/* + * Command LTTNG_ROTATION_SET_SCHEDULE from the lttng-ctl library. + * + * Configure the automatic rotation parameters. + * Set to -1ULL to disable them. + * + * 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, + struct notification_thread_handle *notification_thread_handle) +{ + int ret; + + assert(session); + + DBG("Cmd rotate set schedule session %s", session->name); + + if (session->live_timer || session->snapshot_mode || + !session->output_traces) { + ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE; + goto end; + } + + /* Trying to override an already active timer. */ + if (timer_us && timer_us != -1ULL && session->rotate_timer_period) { + ret = LTTNG_ERR_ROTATION_TIMER_SET; + goto end; + /* Trying to disable an inactive timer. */ + } else if (timer_us == -1ULL && !session->rotate_timer_period) { + ret = LTTNG_ERR_ROTATION_NO_TIMER_SET; + 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; + goto end; + } + + session->rotate_timer_period = timer_us; + /* + * Only start the timer if the session is active, otherwise + * it will be started when the session starts. + */ + if (session->active) { + ret = sessiond_rotate_timer_start(session, timer_us); + if (ret) { + ERR("Failed to enable rotate timer"); + ret = LTTNG_ERR_UNK; + goto end; + } + } + } else if (timer_us == -1ULL && session->rotate_timer_period > 0) { + sessiond_rotate_timer_stop(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; + +end: + return ret; +} + /* * Command ROTATE_GET_CURRENT_PATH from the lttng-ctl library. *