#include "relayd.h"
+static
+bool relayd_supports_chunks(const struct lttcomm_relayd_sock *sock)
+{
+ if (sock->major > 2) {
+ return true;
+ } else if (sock->major == 2 && sock->minor >= 11) {
+ return true;
+ }
+ return false;
+}
+
/*
* Send command. Fill up the header and append the data.
*/
}
/*
- * Starting from 2.11, RELAYD_CREATE_SESSION payload (session_name & hostname)
- * have no length restriction on the sender side.
+ * Starting from 2.11, RELAYD_CREATE_SESSION payload (session_name,
+ * hostname, and base_path) have no length restriction on the sender side.
* Length for both payloads is stored in the msg struct. A new dynamic size
* payload size is introduced.
*/
static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
const char *session_name, const char *hostname,
- int session_live_timer, unsigned int snapshot,
- uint64_t sessiond_session_id, const lttng_uuid sessiond_uuid,
- const uint64_t *current_chunk_id,
- time_t creation_time)
+ const char *base_path, int session_live_timer,
+ unsigned int snapshot, uint64_t sessiond_session_id,
+ const lttng_uuid sessiond_uuid, const uint64_t *current_chunk_id,
+ time_t creation_time, bool session_name_contains_creation_time)
{
int ret;
struct lttcomm_relayd_create_session_2_11 *msg = NULL;
size_t session_name_len;
size_t hostname_len;
+ size_t base_path_len;
size_t msg_length;
+ char *dst;
- /* The two names are sent with a '\0' delimiter between them. */
+ if (!base_path) {
+ base_path = "";
+ }
+ /* The three names are sent with a '\0' delimiter between them. */
session_name_len = strlen(session_name) + 1;
hostname_len = strlen(hostname) + 1;
+ base_path_len = base_path ? strlen(base_path) + 1 : 0;
- msg_length = sizeof(*msg) + session_name_len + hostname_len;
+ msg_length = sizeof(*msg) + session_name_len + hostname_len + base_path_len;
msg = zmalloc(msg_length);
if (!msg) {
PERROR("zmalloc create_session_2_11 command message");
assert(hostname_len <= UINT32_MAX);
msg->hostname_len = htobe32(hostname_len);
- if (lttng_strncpy(msg->names, session_name, session_name_len)) {
+ assert(base_path_len <= UINT32_MAX);
+ msg->base_path_len = htobe32(base_path_len);
+
+ dst = msg->names;
+ if (lttng_strncpy(dst, session_name, session_name_len)) {
+ ret = -1;
+ goto error;
+ }
+ dst += session_name_len;
+ if (lttng_strncpy(dst, hostname, hostname_len)) {
ret = -1;
goto error;
}
- if (lttng_strncpy(msg->names + session_name_len, hostname, hostname_len)) {
+ dst += hostname_len;
+ if (base_path && lttng_strncpy(dst, base_path, base_path_len)) {
ret = -1;
goto error;
}
lttng_uuid_copy(msg->sessiond_uuid, sessiond_uuid);
msg->session_id = htobe64(sessiond_session_id);
-
+ msg->session_name_contains_creation_time = session_name_contains_creation_time;
if (current_chunk_id) {
LTTNG_OPTIONAL_SET(&msg->current_chunk_id,
htobe64(*current_chunk_id));
int relayd_create_session(struct lttcomm_relayd_sock *rsock,
uint64_t *relayd_session_id,
const char *session_name, const char *hostname,
- int session_live_timer,
+ const char *base_path, int session_live_timer,
unsigned int snapshot, uint64_t sessiond_session_id,
const lttng_uuid sessiond_uuid,
const uint64_t *current_chunk_id,
- time_t creation_time)
+ time_t creation_time, bool session_name_contains_creation_time)
{
int ret;
struct lttcomm_relayd_status_session reply;
} else {
/* From 2.11 to ... */
ret = relayd_create_session_2_11(rsock, session_name,
- hostname, session_live_timer, snapshot,
+ hostname, base_path, session_live_timer, snapshot,
sessiond_session_id, sessiond_uuid,
- current_chunk_id, creation_time);
+ current_chunk_id, creation_time,
+ session_name_contains_creation_time);
}
if (ret < 0) {
/*
* Add stream on the relayd and assign stream handle to the stream_id argument.
*
+ * Chunks are not supported by relayd prior to 2.11, but are used to
+ * internally between session daemon and consumer daemon to keep track
+ * of the channel and stream output path.
+ *
* On success return 0 else return ret_code negative value.
*/
int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_name,
assert(rsock);
assert(channel_name);
assert(pathname);
+ assert(trace_chunk);
DBG("Relayd adding stream for channel name %s", channel_name);
/* Compat with relayd 2.1 */
if (rsock->minor == 1) {
/* For 2.1 */
- assert(!trace_chunk);
ret = relayd_add_stream_2_1(rsock, channel_name, pathname);
} else if (rsock->minor > 1 && rsock->minor < 11) {
/* From 2.2 to 2.10 */
- assert(!trace_chunk);
ret = relayd_add_stream_2_2(rsock, channel_name, pathname,
tracefile_size, tracefile_count);
} else {
enum lttng_trace_chunk_status chunk_status;
uint64_t chunk_id;
- assert(trace_chunk);
chunk_status = lttng_trace_chunk_get_id(trace_chunk,
&chunk_id);
assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
char new_chunk_id_buf[MAX_INT_DEC_LEN(*new_chunk_id)] = {};
const char *new_chunk_id_str;
+ if (!relayd_supports_chunks(sock)) {
+ DBG("Refusing to rotate remote streams: relayd does not support chunks");
+ return 0;
+ }
+
lttng_dynamic_buffer_init(&payload);
/* Code flow error. Safety net. */
lttng_dynamic_buffer_init(&payload);
+ if (!relayd_supports_chunks(sock)) {
+ DBG("Refusing to create remote trace chunk: relayd does not support chunks");
+ goto end;
+ }
+
status = lttng_trace_chunk_get_id(chunk, &chunk_id);
if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
ret = -1;
time_t close_timestamp;
LTTNG_OPTIONAL(enum lttng_trace_chunk_command_type) close_command = {};
+ if (!relayd_supports_chunks(sock)) {
+ DBG("Refusing to close remote trace chunk: relayd does not support chunks");
+ goto end;
+ }
+
status = lttng_trace_chunk_get_id(chunk, &chunk_id);
if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
ERR("Failed to get trace chunk id");
struct lttcomm_relayd_trace_chunk_exists msg = {};
struct lttcomm_relayd_trace_chunk_exists_reply reply = {};
+ if (!relayd_supports_chunks(sock)) {
+ DBG("Refusing to check for trace chunk existence: relayd does not support chunks");
+ goto end;
+ }
+
msg = (typeof(msg)){
.chunk_id = htobe64(chunk_id),
};
projects / lttng-tools.git / blobdiff