#include "notification-thread-commands.h"
#include "rotate.h"
#include "rotation-thread.h"
+#include "sessiond-timer.h"
#include "cmd.h"
}
}
+ 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;
+ }
+ }
+
/* Flag this after a successful start. */
session->has_been_started = 1;
session->active = 1;
}
}
+ if (session->rotate_relay_pending_timer_enabled) {
+ sessiond_timer_rotate_pending_stop(session);
+ }
+
+ if (session->rotate_timer_enabled) {
+ sessiond_rotate_timer_stop(session);
+ }
+
/* Clean kernel session teardown */
kernel_destroy_session(ksess);
return 0;
}
+static
+const char *get_base_path(struct ltt_session *session,
+ struct consumer_output *consumer)
+{
+ if (session->net_handle > 0) {
+ return consumer->dst.net.base_dir;
+ } else {
+ return consumer->dst.session_root_path;
+ }
+}
+
/*
* Command LTTNG_ROTATE_SESSION from the lttng-ctl library.
*
assert(session);
- *rotate_return = zmalloc(sizeof(struct lttng_rotate_session_return));
- if (!*rotate_return) {
- ret = -ENOMEM;
- goto end;
+ if (rotate_return) {
+ *rotate_return = zmalloc(sizeof(struct lttng_rotate_session_return));
+ if (!*rotate_return) {
+ ret = -ENOMEM;
+ goto end;
+ }
}
if (session->live_timer || session->snapshot_mode ||
goto error;
}
- if (session->rotate_pending) {
+ if (session->rotate_pending || session->rotate_pending_relay) {
ret = -LTTNG_ERR_ROTATE_PENDING;
goto error;
}
/* Special case for the first rotation. */
if (session->rotate_count == 0) {
+ const char *base_path = NULL;
+
/* Either one of the two sessions is enough to get the root path. */
if (session->kernel_session) {
- snprintf(session->rotation_chunk.current_rotate_path,
- PATH_MAX, "%s",
- session->kernel_session->consumer->dst.session_root_path);
+ base_path = get_base_path(session, session->kernel_session->consumer);
} else if (session->ust_session) {
- snprintf(session->rotation_chunk.current_rotate_path,
- PATH_MAX, "%s",
- session->ust_session->consumer->dst.session_root_path);
+ base_path = get_base_path(session, session->ust_session->consumer);
} else {
assert(0);
}
+ assert(base_path);
+ snprintf(session->rotation_chunk.current_rotate_path,
+ PATH_MAX, "%s",
+ base_path);
+ fprintf(stderr, "b: %s\n", base_path);
} else {
/*
* The currently active tracing path is now the folder we
}
session->rotate_count++;
- session->rotate_pending = 1;
+ session->rotate_pending = true;
+ session->rotate_pending_relay_check_in_progress = false;
session->rotate_status = LTTNG_ROTATE_STARTED;
/*
/* The active path for the next rotation/destroy. */
snprintf(session->rotation_chunk.active_tracing_path,
PATH_MAX, "%s/%s-",
- session->kernel_session->consumer->dst.session_root_path,
+ get_base_path(session, session->kernel_session->consumer),
datetime);
/* The sub-directory for the consumer. */
snprintf(session->kernel_session->consumer->chunk_path,
- PATH_MAX, "/%s-/%s/", datetime,
+ PATH_MAX, "/%s-%s", datetime,
session->kernel_session->consumer->subdir);
ret = kernel_rotate_session(session);
if (ret != LTTNG_OK) {
if (session->ust_session) {
snprintf(session->rotation_chunk.active_tracing_path,
PATH_MAX, "%s/%s-",
- session->ust_session->consumer->dst.session_root_path,
+ get_base_path(session, session->ust_session->consumer),
datetime);
snprintf(session->ust_session->consumer->chunk_path,
- PATH_MAX, "/%s-/", datetime);
+ PATH_MAX, "/%s-", datetime);
ret = ust_app_rotate_session(session);
if (ret != LTTNG_OK) {
goto error;
}
}
- (*rotate_return)->rotate_id = session->rotate_count;
- (*rotate_return)->status = LTTNG_ROTATE_STARTED;
+ if (rotate_return) {
+ (*rotate_return)->rotate_id = session->rotate_count;
+ (*rotate_return)->status = LTTNG_ROTATE_STARTED;
+ }
DBG("Cmd rotate session %s, rotate_id %" PRIu64, session->name,
session->rotate_count);
goto end;
error:
- (*rotate_return)->status = LTTNG_ROTATE_ERROR;
+ if (rotate_return) {
+ (*rotate_return)->status = LTTNG_ROTATE_ERROR;
+ }
end:
return ret;
}
} else if (session->rotate_status == LTTNG_ROTATE_EMPTY) {
DBG("Nothing to rotate");
(*pending_return)->status = LTTNG_ROTATE_EMPTY;
+ /* Rotate with a relay */
+ } else if (session->rotate_pending_relay) {
+ DBG("Session %s, rotate_id %" PRIu64 " still pending",
+ session->name, session->rotate_count);
+ (*pending_return)->status = LTTNG_ROTATE_STARTED;
} else if (session->rotate_pending) {
DBG("Session %s, rotate_id %" PRIu64 " still pending",
session->name, session->rotate_count);
return ret;
}
+/*
+ * Command LTTNG_ROTATE_SETUP from the lttng-ctl library.
+ *
+ * Configure the automatic rotation parameters.
+ *
+ * Return 0 on success or else a LTTNG_ERR code.
+ */
+int cmd_rotate_setup(struct ltt_session *session,
+ uint64_t timer_us, uint64_t size)
+{
+ int ret;
+
+ assert(session);
+
+ DBG("Cmd rotate setup session %s", session->name);
+
+ if (timer_us && session->rotate_timer_period) {
+ ret = LTTNG_ERR_ROTATE_TIMER_EXISTS;
+ goto end;
+ }
+
+ if (size && session->rotate_size) {
+ ret = LTTNG_ERR_ROTATE_SIZE_EXISTS;
+ goto end;
+ }
+
+ if (timer_us && !session->rotate_timer_period) {
+ 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_size = size;
+
+ ret = LTTNG_OK;
+
+ goto end;
+
+end:
+ return ret;
+}
+
/*
* Init command subsystem.
*/
projects / deliverable / lttng-tools.git / blobdiff