X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=70a1948c328cc690e39e4add4d67f4a2a8f2fe44;hp=2a7152b892192f7e683bf881b2b106af0a2da36c;hb=cef0f7d51b8025d3ba04e6496242c1cca1641aa6;hpb=7c5aef6226a4752f3a4e60cd0b52c741dced395e diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index 2a7152b89..70a1948c3 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -47,21 +47,28 @@ #include #include #include -#include #include #include #include +#include "cmd.h" +#include "ctf-trace.h" +#include "index.h" +#include "utils.h" #include "lttng-relayd.h" +#include "live.h" +#include "health-relayd.h" /* command line options */ +char *opt_output_path; static int opt_daemon; -static char *opt_output_path; static struct lttng_uri *control_uri; static struct lttng_uri *data_uri; +static struct lttng_uri *live_uri; const char *progname; -static int is_root; /* Set to 1 if the daemon is running as root */ + +const char *tracing_group_name = DEFAULT_TRACING_GROUP; /* * Quit pipe for all threads. This permits a single cancellation point @@ -81,6 +88,7 @@ static int dispatch_thread_exit; static pthread_t listener_thread; static pthread_t dispatcher_thread; static pthread_t worker_thread; +static pthread_t health_thread; static uint64_t last_relay_stream_id; static uint64_t last_relay_session_id; @@ -97,6 +105,22 @@ static struct relay_cmd_queue relay_cmd_queue; static char *data_buffer; static unsigned int data_buffer_size; +/* We need those values for the file/dir creation. */ +static uid_t relayd_uid; +static gid_t relayd_gid; + +/* Global relay stream hash table. */ +struct lttng_ht *relay_streams_ht; + +/* Global relay viewer stream hash table. */ +struct lttng_ht *viewer_streams_ht; + +/* Global hash table that stores relay index object. */ +struct lttng_ht *indexes_ht; + +/* Relayd health monitoring */ +struct health_app *health_relayd; + /* * usage function on stderr */ @@ -104,12 +128,13 @@ static void usage(void) { fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname); - fprintf(stderr, " -h, --help Display this usage.\n"); - fprintf(stderr, " -d, --daemonize Start as a daemon.\n"); - fprintf(stderr, " -C, --control-port Control port listening (URI)\n"); - fprintf(stderr, " -D, --data-port Data port listening (URI)\n"); - fprintf(stderr, " -o, --output Output path for traces (PATH)\n"); - fprintf(stderr, " -v, --verbose Verbose mode. Activate DBG() macro.\n"); + fprintf(stderr, " -h, --help Display this usage.\n"); + fprintf(stderr, " -d, --daemonize Start as a daemon.\n"); + fprintf(stderr, " -C, --control-port URL Control port listening.\n"); + fprintf(stderr, " -D, --data-port URL Data port listening.\n"); + fprintf(stderr, " -o, --output PATH Output path for traces. Must use an absolute path.\n"); + fprintf(stderr, " -v, --verbose Verbose mode. Activate DBG() macro.\n"); + fprintf(stderr, " -g, --group NAME Specify the tracing group name. (default: tracing)\n"); } static @@ -123,6 +148,7 @@ int parse_args(int argc, char **argv) { "control-port", 1, 0, 'C', }, { "data-port", 1, 0, 'D', }, { "daemonize", 0, 0, 'd', }, + { "group", 1, 0, 'g', }, { "help", 0, 0, 'h', }, { "output", 1, 0, 'o', }, { "verbose", 0, 0, 'v', }, @@ -131,7 +157,7 @@ int parse_args(int argc, char **argv) while (1) { int option_index = 0; - c = getopt_long(argc, argv, "dhv" "C:D:o:", + c = getopt_long(argc, argv, "dhv" "C:D:o:g:", long_options, &option_index); if (c == -1) { break; @@ -167,6 +193,9 @@ int parse_args(int argc, char **argv) case 'd': opt_daemon = 1; break; + case 'g': + tracing_group_name = optarg; + break; case 'h': usage(); exit(EXIT_FAILURE); @@ -220,6 +249,21 @@ int parse_args(int argc, char **argv) goto exit; } } + if (live_uri == NULL) { + ret = asprintf(&default_address, "tcp://0.0.0.0:%d", + DEFAULT_NETWORK_VIEWER_PORT); + if (ret < 0) { + PERROR("asprintf default viewer control address"); + goto exit; + } + + ret = uri_parse(default_address, &live_uri); + free(default_address); + if (ret < 0) { + ERR("Invalid viewer control URI specified"); + goto exit; + } + } exit: return ret; @@ -249,18 +293,26 @@ void cleanup(void) static int notify_thread_pipe(int wpipe) { - int ret; + ssize_t ret; - do { - ret = write(wpipe, "!", 1); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { + ret = lttng_write(wpipe, "!", 1); + if (ret < 1) { PERROR("write poll pipe"); } return ret; } +static void notify_health_quit_pipe(int *pipe) +{ + ssize_t ret; + + ret = lttng_write(pipe[1], "4", 1); + if (ret < 1) { + PERROR("write relay health quit"); + } +} + /* * Stop all threads by closing the thread quit pipe. */ @@ -276,6 +328,8 @@ void stop_threads(void) ERR("write error on thread quit pipe"); } + notify_health_quit_pipe(health_quit_pipe); + /* Dispatch thread */ CMM_STORE_SHARED(dispatch_thread_exit, 1); futex_nto1_wake(&relay_cmd_queue.futex); @@ -455,6 +509,13 @@ int close_stream_check(struct relay_stream *stream) { if (stream->close_flag && stream->prev_seq == stream->last_net_seq_num) { + /* + * We are about to close the stream so set the data pending flag to 1 + * which will make the end data pending command skip the stream which + * is now closed and ready. Note that after proceeding to a file close, + * the written file is ready for reading. + */ + stream->data_pending_check_done = 1; return 1; } return 0; @@ -474,6 +535,10 @@ void *relay_thread_listener(void *data) DBG("[thread] Relay listener started"); + health_register(health_relayd, HEALTH_RELAYD_TYPE_LISTENER); + + health_code_update(); + control_sock = relay_init_sock(control_uri); if (!control_sock) { goto error_sock_control; @@ -505,12 +570,14 @@ void *relay_thread_listener(void *data) } while (1) { - DBG("Listener accepting connections"); + health_code_update(); - nb_fd = LTTNG_POLL_GETNB(&events); + DBG("Listener accepting connections"); restart: + health_poll_entry(); ret = lttng_poll_wait(&events, -1); + health_poll_exit(); if (ret < 0) { /* * Restart interrupted system call. @@ -521,8 +588,12 @@ restart: goto error; } + nb_fd = ret; + DBG("Relay new connection received"); for (i = 0; i < nb_fd; i++) { + health_code_update(); + /* Fetch once the poll data */ revents = LTTNG_POLL_GETEV(&events, i); pollfd = LTTNG_POLL_GETFD(&events, i); @@ -617,8 +688,10 @@ error_sock_relay: lttcomm_destroy_sock(control_sock); error_sock_control: if (err) { - DBG("Thread exited with error"); + health_error(); + ERR("Health error occurred in %s", __func__); } + health_unregister(health_relayd); DBG("Relay listener thread cleanup complete"); stop_threads(); return NULL; @@ -630,17 +703,26 @@ error_sock_control: static void *relay_thread_dispatcher(void *data) { - int ret; + int err = -1; + ssize_t ret; struct cds_wfq_node *node; struct relay_command *relay_cmd = NULL; DBG("[thread] Relay dispatcher started"); + health_register(health_relayd, HEALTH_RELAYD_TYPE_DISPATCHER); + + health_code_update(); + while (!CMM_LOAD_SHARED(dispatch_thread_exit)) { + health_code_update(); + /* Atomically prepare the queue futex */ futex_nto1_prepare(&relay_cmd_queue.futex); do { + health_code_update(); + /* Dequeue commands */ node = cds_wfq_dequeue_blocking(&relay_cmd_queue.queue); if (node == NULL) { @@ -657,257 +739,260 @@ void *relay_thread_dispatcher(void *data) * call is blocking so we can be assured that the data will be read * at some point in time or wait to the end of the world :) */ - do { - ret = write(relay_cmd_pipe[1], relay_cmd, - sizeof(struct relay_command)); - } while (ret < 0 && errno == EINTR); + ret = lttng_write(relay_cmd_pipe[1], relay_cmd, + sizeof(struct relay_command)); free(relay_cmd); - if (ret < 0) { + if (ret < sizeof(struct relay_command)) { PERROR("write cmd pipe"); goto error; } } while (node != NULL); /* Futex wait on queue. Blocking call on futex() */ + health_poll_entry(); futex_nto1_wait(&relay_cmd_queue.futex); + health_poll_exit(); } + /* Normal exit, no error */ + err = 0; + error: + if (err) { + health_error(); + ERR("Health error occurred in %s", __func__); + } + health_unregister(health_relayd); DBG("Dispatch thread dying"); stop_threads(); return NULL; } /* - * Return the realpath(3) of the path even if the last directory token does not - * exist. For example, with /tmp/test1/test2, if test2/ does not exist but the - * /tmp/test1 does, the real path is returned. In normal time, realpath(3) - * fails if the end point directory does not exist. + * Get stream from stream id. + * Need to be called with RCU read-side lock held. */ -static -char *expand_full_path(const char *path) +struct relay_stream *relay_stream_find_by_id(uint64_t stream_id) { - const char *end_path = path; - char *next, *cut_path, *expanded_path, *respath; - - /* Find last token delimited by '/' */ - while ((next = strpbrk(end_path + 1, "/"))) { - end_path = next; - } - - /* Cut last token from original path */ - cut_path = strndup(path, end_path - path); + struct lttng_ht_node_ulong *node; + struct lttng_ht_iter iter; + struct relay_stream *ret; - expanded_path = malloc(PATH_MAX); - if (expanded_path == NULL) { - respath = NULL; + lttng_ht_lookup(relay_streams_ht, + (void *)((unsigned long) stream_id), + &iter); + node = lttng_ht_iter_get_node_ulong(&iter); + if (node == NULL) { + DBG("Relay stream %" PRIu64 " not found", stream_id); + ret = NULL; goto end; } - respath = realpath(cut_path, expanded_path); - if (respath == NULL) { - switch (errno) { - case ENOENT: - ERR("%s: No such file or directory", cut_path); - break; - default: - PERROR("realpath"); - break; - } - free(expanded_path); - } else { - /* Add end part to expanded path */ - strcat(respath, end_path); - } + ret = caa_container_of(node, struct relay_stream, stream_n); + end: - free(cut_path); - return respath; + return ret; } +static +void deferred_free_stream(struct rcu_head *head) +{ + struct relay_stream *stream = + caa_container_of(head, struct relay_stream, rcu_node); + + ctf_trace_try_destroy(stream->ctf_trace); + + free(stream->path_name); + free(stream->channel_name); + free(stream); +} -/* - * config_get_default_path - * - * Returns the HOME directory path. Caller MUST NOT free(3) the return pointer. - */ static -char *config_get_default_path(void) +void deferred_free_session(struct rcu_head *head) { - return getenv("HOME"); + struct relay_session *session = + caa_container_of(head, struct relay_session, rcu_node); + free(session); } /* - * Create recursively directory using the FULL path. + * Close a given stream. The stream is freed using a call RCU. + * + * RCU read side lock MUST be acquired. If NO close_stream_check() was called + * BEFORE the stream lock MUST be acquired. */ -static -int mkdir_recursive(char *path, mode_t mode) +static void destroy_stream(struct relay_stream *stream) { - char *p, tmp[PATH_MAX]; - struct stat statbuf; - size_t len; - int ret; - - ret = snprintf(tmp, sizeof(tmp), "%s", path); - if (ret < 0) { - PERROR("snprintf mkdir"); - goto error; - } + int delret; + struct relay_viewer_stream *vstream; + struct lttng_ht_iter iter; - len = ret; - if (tmp[len - 1] == '/') { - tmp[len - 1] = 0; - } + assert(stream); - for (p = tmp + 1; *p; p++) { - if (*p == '/') { - *p = 0; - if (tmp[strlen(tmp) - 1] == '.' && - tmp[strlen(tmp) - 2] == '.' && - tmp[strlen(tmp) - 3] == '/') { - ERR("Using '/../' is not permitted in the trace path (%s)", - tmp); - ret = -1; - goto error; - } - ret = stat(tmp, &statbuf); - if (ret < 0) { - ret = mkdir(tmp, mode); - if (ret < 0) { - if (errno != EEXIST) { - PERROR("mkdir recursive"); - ret = -errno; - goto error; - } - } - } - *p = '/'; - } + delret = close(stream->fd); + if (delret < 0) { + PERROR("close stream"); } - ret = mkdir(tmp, mode); - if (ret < 0) { - if (errno != EEXIST) { - PERROR("mkdir recursive last piece"); - ret = -errno; - } else { - ret = 0; + if (stream->index_fd >= 0) { + delret = close(stream->index_fd); + if (delret < 0) { + PERROR("close stream index_fd"); } } -error: - return ret; + vstream = live_find_viewer_stream_by_id(stream->stream_handle); + if (vstream) { + /* + * Set the last good value into the viewer stream. This is done + * right before the stream gets deleted from the hash table. The + * lookup failure on the live thread side of a stream indicates + * that the viewer stream index received value should be used. + */ + pthread_mutex_lock(&stream->viewer_stream_rotation_lock); + vstream->total_index_received = stream->total_index_received; + vstream->close_write_flag = 1; + pthread_mutex_unlock(&stream->viewer_stream_rotation_lock); + } + + /* Cleanup index of that stream. */ + relay_index_destroy_by_stream_id(stream->stream_handle); + + iter.iter.node = &stream->stream_n.node; + delret = lttng_ht_del(relay_streams_ht, &iter); + assert(!delret); + iter.iter.node = &stream->ctf_trace_node.node; + delret = lttng_ht_del(stream->ctf_traces_ht, &iter); + assert(!delret); + call_rcu(&stream->rcu_node, deferred_free_stream); + DBG("Closed tracefile %d from close stream", stream->fd); } +/* + * relay_delete_session: Free all memory associated with a session and + * close all the FDs + */ static -char *create_output_path_auto(char *path_name) +void relay_delete_session(struct relay_command *cmd, + struct lttng_ht *sessions_ht) { + struct lttng_ht_iter iter; + struct lttng_ht_node_ulong *node; + struct relay_stream *stream; int ret; - char *traces_path = NULL; - char *alloc_path = NULL; - char *default_path; - - default_path = config_get_default_path(); - if (default_path == NULL) { - ERR("Home path not found.\n \ - Please specify an output path using -o, --output PATH"); - goto exit; - } - alloc_path = strdup(default_path); - if (alloc_path == NULL) { - PERROR("Path allocation"); - goto exit; - } - ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME - "/%s", alloc_path, path_name); - if (ret < 0) { - PERROR("asprintf trace dir name"); - goto exit; + + if (!cmd->session) { + return; } -exit: - free(alloc_path); - return traces_path; -} -static -char *create_output_path_noauto(char *path_name) -{ - int ret; - char *traces_path = NULL; - char *full_path; + DBG("Relay deleting session %" PRIu64, cmd->session->id); - full_path = expand_full_path(opt_output_path); - ret = asprintf(&traces_path, "%s/%s", full_path, path_name); - if (ret < 0) { - PERROR("asprintf trace dir name"); - goto exit; + rcu_read_lock(); + cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, node, node) { + node = lttng_ht_iter_get_node_ulong(&iter); + if (!node) { + continue; + } + stream = caa_container_of(node, struct relay_stream, stream_n); + if (stream->session == cmd->session) { + destroy_stream(stream); + cmd->session->stream_count--; + assert(cmd->session->stream_count >= 0); + } } -exit: - free(full_path); - return traces_path; + + /* Make this session not visible anymore. */ + iter.iter.node = &cmd->session->session_n.node; + ret = lttng_ht_del(sessions_ht, &iter); + assert(!ret); + call_rcu(&cmd->session->rcu_node, deferred_free_session); + rcu_read_unlock(); } /* - * create_output_path: create the output trace directory + * Copy index data from the control port to a given index object. */ -static -char *create_output_path(char *path_name) +static void copy_index_control_data(struct relay_index *index, + struct lttcomm_relayd_index *data) { - if (opt_output_path == NULL) { - return create_output_path_auto(path_name); - } else { - return create_output_path_noauto(path_name); - } -} + assert(index); + assert(data); -static -void deferred_free_stream(struct rcu_head *head) -{ - struct relay_stream *stream = - caa_container_of(head, struct relay_stream, rcu_node); - free(stream); + /* + * The index on disk is encoded in big endian, so we don't need to convert + * the data received on the network. The data_offset value is NEVER + * modified here and is updated by the data thread. + */ + index->index_data.packet_size = data->packet_size; + index->index_data.content_size = data->content_size; + index->index_data.timestamp_begin = data->timestamp_begin; + index->index_data.timestamp_end = data->timestamp_end; + index->index_data.events_discarded = data->events_discarded; + index->index_data.stream_id = data->stream_id; } /* - * relay_delete_session: Free all memory associated with a session and - * close all the FDs + * Handle the RELAYD_CREATE_SESSION command. + * + * On success, send back the session id or else return a negative value. */ static -void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht) +int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr, + struct relay_command *cmd, + struct lttng_ht *sessions_ht) { - struct lttng_ht_iter iter; - struct lttng_ht_node_ulong *node; - struct relay_stream *stream; - int ret; + int ret = 0, send_ret; + struct relay_session *session; + struct lttcomm_relayd_status_session reply; - if (!cmd->session) { - return; + assert(recv_hdr); + assert(cmd); + + memset(&reply, 0, sizeof(reply)); + + session = zmalloc(sizeof(struct relay_session)); + if (session == NULL) { + PERROR("relay session zmalloc"); + ret = -1; + goto error; } - DBG("Relay deleting session %" PRIu64, cmd->session->id); + session->id = ++last_relay_session_id; + session->sock = cmd->sock; + session->minor = cmd->minor; + session->major = cmd->major; + cmd->session = session; - lttcomm_destroy_sock(cmd->session->sock); + reply.session_id = htobe64(session->id); - rcu_read_lock(); - cds_lfht_for_each_entry(streams_ht->ht, &iter.iter, node, node) { - node = lttng_ht_iter_get_node_ulong(&iter); - if (node) { - stream = caa_container_of(node, - struct relay_stream, stream_n); - if (stream->session == cmd->session) { - ret = close(stream->fd); - if (ret < 0) { - PERROR("close stream fd on delete session"); - } - ret = lttng_ht_del(streams_ht, &iter); - assert(!ret); - call_rcu(&stream->rcu_node, - deferred_free_stream); - } - } + switch (cmd->minor) { + case 4: /* LTTng sessiond 2.4 */ + default: + ret = cmd_create_session_2_4(cmd, session); + break; + } + + lttng_ht_node_init_ulong(&session->session_n, + (unsigned long) session->id); + lttng_ht_add_unique_ulong(sessions_ht, + &session->session_n); + + DBG("Created session %" PRIu64, session->id); + +error: + if (ret < 0) { + reply.ret_code = htobe32(LTTNG_ERR_FATAL); + } else { + reply.ret_code = htobe32(LTTNG_OK); } - rcu_read_unlock(); - free(cmd->session); + send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + if (send_ret < 0) { + ERR("Relayd sending session id"); + ret = send_ret; + } + + return ret; } /* @@ -915,29 +1000,19 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht */ static int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd, struct lttng_ht *streams_ht) + struct relay_command *cmd, struct lttng_ht *sessions_ht) { struct relay_session *session = cmd->session; - struct lttcomm_relayd_add_stream stream_info; struct relay_stream *stream = NULL; struct lttcomm_relayd_status_stream reply; - char *path = NULL, *root_path = NULL; int ret, send_ret; - if (!session || session->version_check_done == 0) { + if (!session || cmd->version_check_done == 0) { ERR("Trying to add a stream before version check"); ret = -1; goto end_no_session; } - /* FIXME : use data_size for something ? */ - ret = cmd->sock->ops->recvmsg(cmd->sock, &stream_info, - sizeof(struct lttcomm_relayd_add_stream), 0); - if (ret < sizeof(struct lttcomm_relayd_add_stream)) { - ERR("Relay didn't receive valid add_stream struct size : %d", ret); - ret = -1; - goto end_no_session; - } stream = zmalloc(sizeof(struct relay_stream)); if (stream == NULL) { PERROR("relay stream zmalloc"); @@ -945,63 +1020,112 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr, goto end_no_session; } + switch (cmd->minor) { + case 1: /* LTTng sessiond 2.1 */ + ret = cmd_recv_stream_2_1(cmd, stream); + break; + case 2: /* LTTng sessiond 2.2 */ + default: + ret = cmd_recv_stream_2_2(cmd, stream); + break; + } + if (ret < 0) { + goto err_free_stream; + } + rcu_read_lock(); stream->stream_handle = ++last_relay_stream_id; stream->prev_seq = -1ULL; stream->session = session; + stream->index_fd = -1; + stream->read_index_fd = -1; + stream->ctf_trace = NULL; + pthread_mutex_init(&stream->lock, NULL); - root_path = create_output_path(stream_info.pathname); - if (!root_path) { - ret = -1; - goto end; - } - ret = mkdir_recursive(root_path, S_IRWXU | S_IRWXG); + ret = utils_mkdir_recursive(stream->path_name, S_IRWXU | S_IRWXG); if (ret < 0) { ERR("relay creating output directory"); goto end; } - ret = asprintf(&path, "%s/%s", root_path, stream_info.channel_name); + /* + * No need to use run_as API here because whatever we receives, the relayd + * uses its own credentials for the stream files. + */ + ret = utils_create_stream_file(stream->path_name, stream->channel_name, + stream->tracefile_size, 0, relayd_uid, relayd_gid, NULL); if (ret < 0) { - PERROR("asprintf stream path"); + ERR("Create output file"); goto end; } - - ret = open(path, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU|S_IRWXG|S_IRWXO); - if (ret < 0) { - PERROR("Relay creating trace file"); - goto end; + stream->fd = ret; + if (stream->tracefile_size) { + DBG("Tracefile %s/%s_0 created", stream->path_name, stream->channel_name); + } else { + DBG("Tracefile %s/%s created", stream->path_name, stream->channel_name); } - stream->fd = ret; - DBG("Tracefile %s created", path); + if (!strncmp(stream->channel_name, DEFAULT_METADATA_NAME, NAME_MAX)) { + stream->metadata_flag = 1; + /* + * When we receive a new metadata stream, we create a new + * ctf_trace and we assign this ctf_trace to all streams with + * the same path. + * + * If later on we receive a new stream for the same ctf_trace, + * we copy the information from the first hit in the HT to the + * new stream. + */ + stream->ctf_trace = ctf_trace_create(); + if (!stream->ctf_trace) { + ret = -1; + goto end; + } + stream->ctf_trace->refcount++; + stream->ctf_trace->metadata_stream = stream; + } + ctf_trace_assign(cmd->ctf_traces_ht, stream); + stream->ctf_traces_ht = cmd->ctf_traces_ht; lttng_ht_node_init_ulong(&stream->stream_n, (unsigned long) stream->stream_handle); - lttng_ht_add_unique_ulong(streams_ht, + lttng_ht_add_unique_ulong(relay_streams_ht, &stream->stream_n); - DBG("Relay new stream added %s", stream_info.channel_name); + lttng_ht_node_init_str(&stream->ctf_trace_node, stream->path_name); + lttng_ht_add_str(cmd->ctf_traces_ht, &stream->ctf_trace_node); + session->stream_count++; + + DBG("Relay new stream added %s with ID %" PRIu64, stream->channel_name, + stream->stream_handle); end: - free(path); - free(root_path); + reply.handle = htobe64(stream->stream_handle); /* send the session id to the client or a negative return code on error */ if (ret < 0) { reply.ret_code = htobe32(LTTNG_ERR_UNK); + /* stream was not properly added to the ht, so free it */ + free(stream); } else { reply.ret_code = htobe32(LTTNG_OK); } - reply.handle = htobe64(stream->stream_handle); + send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(struct lttcomm_relayd_status_stream), 0); if (send_ret < 0) { ERR("Relay sending stream id"); + ret = send_ret; } rcu_read_unlock(); end_no_session: return ret; + +err_free_stream: + free(stream->path_name); + free(stream->channel_name); + free(stream); + return ret; } /* @@ -1009,19 +1133,17 @@ end_no_session: */ static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd, struct lttng_ht *streams_ht) + struct relay_command *cmd) { + int ret, send_ret; struct relay_session *session = cmd->session; struct lttcomm_relayd_close_stream stream_info; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; - int ret, send_ret; - struct lttng_ht_node_ulong *node; - struct lttng_ht_iter iter; DBG("Close stream received"); - if (!session || session->version_check_done == 0) { + if (!session || cmd->version_check_done == 0) { ERR("Trying to close a stream before version check"); ret = -1; goto end_no_session; @@ -1030,23 +1152,18 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, ret = cmd->sock->ops->recvmsg(cmd->sock, &stream_info, sizeof(struct lttcomm_relayd_close_stream), 0); if (ret < sizeof(struct lttcomm_relayd_close_stream)) { - ERR("Relay didn't receive valid add_stream struct size : %d", ret); + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } else { + ERR("Relay didn't receive valid add_stream struct size : %d", ret); + } ret = -1; goto end_no_session; } rcu_read_lock(); - lttng_ht_lookup(streams_ht, - (void *)((unsigned long) be64toh(stream_info.stream_id)), - &iter); - node = lttng_ht_iter_get_node_ulong(&iter); - if (node == NULL) { - DBG("Relay stream %" PRIu64 " not found", be64toh(stream_info.stream_id)); - ret = -1; - goto end_unlock; - } - - stream = caa_container_of(node, struct relay_stream, stream_n); + stream = relay_stream_find_by_id(be64toh(stream_info.stream_id)); if (!stream) { ret = -1; goto end_unlock; @@ -1054,19 +1171,11 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, stream->last_net_seq_num = be64toh(stream_info.last_net_seq_num); stream->close_flag = 1; + session->stream_count--; + assert(session->stream_count >= 0); if (close_stream_check(stream)) { - int delret; - - delret = close(stream->fd); - if (delret < 0) { - PERROR("close stream"); - } - delret = lttng_ht_del(streams_ht, &iter); - assert(!delret); - call_rcu(&stream->rcu_node, - deferred_free_stream); - DBG("Closed tracefile %d from close stream", stream->fd); + destroy_stream(stream); } end_unlock: @@ -1081,6 +1190,7 @@ end_unlock: sizeof(struct lttcomm_relayd_generic_reply), 0); if (send_ret < 0) { ERR("Relay sending stream id"); + ret = send_ret; } end_no_session: @@ -1132,42 +1242,14 @@ int relay_start(struct lttcomm_relayd_hdr *recv_hdr, } /* - * Get stream from stream id. - * Need to be called with RCU read-side lock held. + * Append padding to the file pointed by the file descriptor fd. */ -static -struct relay_stream *relay_stream_from_stream_id(uint64_t stream_id, - struct lttng_ht *streams_ht) +static int write_padding_to_file(int fd, uint32_t size) { - struct lttng_ht_node_ulong *node; - struct lttng_ht_iter iter; - struct relay_stream *ret; + ssize_t ret = 0; + char *zeros; - lttng_ht_lookup(streams_ht, - (void *)((unsigned long) stream_id), - &iter); - node = lttng_ht_iter_get_node_ulong(&iter); - if (node == NULL) { - DBG("Relay stream %" PRIu64 " not found", stream_id); - ret = NULL; - goto end; - } - - ret = caa_container_of(node, struct relay_stream, stream_n); - -end: - return ret; -} - -/* - * Append padding to the file pointed by the file descriptor fd. - */ -static int write_padding_to_file(int fd, uint32_t size) -{ - int ret = 0; - char *zeros; - - if (size == 0) { + if (size == 0) { goto end; } @@ -1178,10 +1260,8 @@ static int write_padding_to_file(int fd, uint32_t size) goto end; } - do { - ret = write(fd, zeros, size); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { + ret = lttng_write(fd, zeros, size); + if (ret < size) { PERROR("write padding to file"); } @@ -1196,9 +1276,10 @@ end: */ static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd, struct lttng_ht *streams_ht) + struct relay_command *cmd) { int ret = htobe32(LTTNG_OK); + ssize_t size_ret; struct relay_session *session = cmd->session; struct lttcomm_relayd_metadata_payload *metadata_struct; struct relay_stream *metadata_stream; @@ -1220,39 +1301,44 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, if (data_buffer_size < data_size) { /* In case the realloc fails, we can free the memory */ - char *tmp_data_ptr = data_buffer; - data_buffer = realloc(data_buffer, data_size); - if (!data_buffer) { + char *tmp_data_ptr; + + tmp_data_ptr = realloc(data_buffer, data_size); + if (!tmp_data_ptr) { ERR("Allocating data buffer"); - free(tmp_data_ptr); + free(data_buffer); ret = -1; goto end; } + data_buffer = tmp_data_ptr; data_buffer_size = data_size; } memset(data_buffer, 0, data_size); DBG2("Relay receiving metadata, waiting for %" PRIu64 " bytes", data_size); ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size, 0); if (ret < 0 || ret != data_size) { + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } else { + ERR("Relay didn't receive the whole metadata"); + } ret = -1; - ERR("Relay didn't receive the whole metadata"); goto end; } metadata_struct = (struct lttcomm_relayd_metadata_payload *) data_buffer; rcu_read_lock(); - metadata_stream = relay_stream_from_stream_id( - be64toh(metadata_struct->stream_id), streams_ht); + metadata_stream = relay_stream_find_by_id( + be64toh(metadata_struct->stream_id)); if (!metadata_stream) { ret = -1; goto end_unlock; } - do { - ret = write(metadata_stream->fd, metadata_struct->payload, - payload_size); - } while (ret < 0 && errno == EINTR); - if (ret < payload_size) { + size_ret = lttng_write(metadata_stream->fd, metadata_struct->payload, + payload_size); + if (size_ret < payload_size) { ERR("Relay error writing metadata on file"); ret = -1; goto end_unlock; @@ -1263,6 +1349,8 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, if (ret < 0) { goto end_unlock; } + metadata_stream->ctf_trace->metadata_received += + payload_size + be32toh(metadata_struct->padding_size); DBG2("Relay metadata written"); @@ -1277,48 +1365,48 @@ end: */ static int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd) + struct relay_command *cmd, struct lttng_ht *sessions_ht) { int ret; struct lttcomm_relayd_version reply, msg; - struct relay_session *session; - if (cmd->session == NULL) { - session = zmalloc(sizeof(struct relay_session)); - if (session == NULL) { - PERROR("relay session zmalloc"); - ret = -1; - goto end; - } - session->id = ++last_relay_session_id; - DBG("Created session %" PRIu64, session->id); - cmd->session = session; - } else { - session = cmd->session; - } - session->version_check_done = 1; + assert(cmd); + + cmd->version_check_done = 1; /* Get version from the other side. */ ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); if (ret < 0 || ret != sizeof(msg)) { + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } else { + ERR("Relay failed to receive the version values."); + } ret = -1; - ERR("Relay failed to receive the version values."); goto end; } - /* - * For now, we just ignore the received version but after 2.1 stable - * release, a check must be done to see if we either adapt to the other - * side version (which MUST be lower than us) or keep the latest data - * structure considering that the other side will adapt. - */ + reply.major = RELAYD_VERSION_COMM_MAJOR; + reply.minor = RELAYD_VERSION_COMM_MINOR; - ret = sscanf(VERSION, "%u.%u", &reply.major, &reply.minor); - if (ret < 2) { - ERR("Error in scanning version"); - ret = -1; + /* Major versions must be the same */ + if (reply.major != be32toh(msg.major)) { + DBG("Incompatible major versions (%u vs %u), deleting session", + reply.major, be32toh(msg.major)); + relay_delete_session(cmd, sessions_ht); + ret = 0; goto end; } + + cmd->major = reply.major; + /* We adapt to the lowest compatible version */ + if (reply.minor <= be32toh(msg.minor)) { + cmd->minor = reply.minor; + } else { + cmd->minor = be32toh(msg.minor); + } + reply.major = htobe32(reply.major); reply.minor = htobe32(reply.minor); ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, @@ -1326,8 +1414,9 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr, if (ret < 0) { ERR("Relay sending version"); } - DBG("Version check done (%u.%u)", be32toh(reply.major), - be32toh(reply.minor)); + + DBG("Version check done using protocol %u.%u", cmd->major, + cmd->minor); end: return ret; @@ -1338,20 +1427,18 @@ end: */ static int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd, struct lttng_ht *streams_ht) + struct relay_command *cmd) { struct relay_session *session = cmd->session; struct lttcomm_relayd_data_pending msg; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; int ret; - struct lttng_ht_node_ulong *node; - struct lttng_ht_iter iter; uint64_t last_net_seq_num, stream_id; DBG("Data pending command received"); - if (!session || session->version_check_done == 0) { + if (!session || cmd->version_check_done == 0) { ERR("Trying to check for data before version check"); ret = -1; goto end_no_session; @@ -1359,7 +1446,13 @@ int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); if (ret < sizeof(msg)) { - ERR("Relay didn't receive valid data_pending struct size : %d", ret); + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } else { + ERR("Relay didn't receive valid data_pending struct size : %d", + ret); + } ret = -1; goto end_no_session; } @@ -1368,23 +1461,18 @@ int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, last_net_seq_num = be64toh(msg.last_net_seq_num); rcu_read_lock(); - lttng_ht_lookup(streams_ht, (void *)((unsigned long) stream_id), &iter); - node = lttng_ht_iter_get_node_ulong(&iter); - if (node == NULL) { - DBG("Relay stream %" PRIu64 " not found", stream_id); + stream = relay_stream_find_by_id(stream_id); + if (stream == NULL) { ret = -1; goto end_unlock; } - stream = caa_container_of(node, struct relay_stream, stream_n); - assert(stream); - DBG("Data pending for stream id %" PRIu64 " prev_seq %" PRIu64 " and last_seq %" PRIu64, stream_id, stream->prev_seq, last_net_seq_num); /* Avoid wrapping issue */ - if (((int64_t) (stream->prev_seq - last_net_seq_num)) <= 0) { + if (((int64_t) (stream->prev_seq - last_net_seq_num)) >= 0) { /* Data has in fact been written and is NOT pending */ ret = 0; } else { @@ -1392,6 +1480,9 @@ int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, ret = 1; } + /* Pending check is now done. */ + stream->data_pending_check_done = 1; + end_unlock: rcu_read_unlock(); @@ -1417,55 +1508,376 @@ int relay_quiescent_control(struct lttcomm_relayd_hdr *recv_hdr, struct relay_command *cmd) { int ret; + uint64_t stream_id; + struct relay_stream *stream; + struct lttng_ht_iter iter; + struct lttcomm_relayd_quiescent_control msg; struct lttcomm_relayd_generic_reply reply; DBG("Checking quiescent state on control socket"); + if (!cmd->session || cmd->version_check_done == 0) { + ERR("Trying to check for data before version check"); + ret = -1; + goto end_no_session; + } + + ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); + if (ret < sizeof(msg)) { + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } else { + ERR("Relay didn't receive valid begin data_pending struct size: %d", + ret); + } + ret = -1; + goto end_no_session; + } + + stream_id = be64toh(msg.stream_id); + + rcu_read_lock(); + cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream, + stream_n.node) { + if (stream->stream_handle == stream_id) { + stream->data_pending_check_done = 1; + DBG("Relay quiescent control pending flag set to %" PRIu64, + stream_id); + break; + } + } + rcu_read_unlock(); + reply.ret_code = htobe32(LTTNG_OK); ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); if (ret < 0) { ERR("Relay data quiescent control ret code failed"); } +end_no_session: + return ret; +} + +/* + * Initialize a data pending command. This means that a client is about to ask + * for data pending for each stream he/she holds. Simply iterate over all + * streams of a session and set the data_pending_check_done flag. + * + * This command returns to the client a LTTNG_OK code. + */ +static +int relay_begin_data_pending(struct lttcomm_relayd_hdr *recv_hdr, + struct relay_command *cmd) +{ + int ret; + struct lttng_ht_iter iter; + struct lttcomm_relayd_begin_data_pending msg; + struct lttcomm_relayd_generic_reply reply; + struct relay_stream *stream; + uint64_t session_id; + + assert(recv_hdr); + assert(cmd); + + DBG("Init streams for data pending"); + + if (!cmd->session || cmd->version_check_done == 0) { + ERR("Trying to check for data before version check"); + ret = -1; + goto end_no_session; + } + + ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); + if (ret < sizeof(msg)) { + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } else { + ERR("Relay didn't receive valid begin data_pending struct size: %d", + ret); + } + ret = -1; + goto end_no_session; + } + + session_id = be64toh(msg.session_id); + + /* + * Iterate over all streams to set the begin data pending flag. For now, the + * streams are indexed by stream handle so we have to iterate over all + * streams to find the one associated with the right session_id. + */ + rcu_read_lock(); + cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream, + stream_n.node) { + if (stream->session->id == session_id) { + stream->data_pending_check_done = 0; + DBG("Set begin data pending flag to stream %" PRIu64, + stream->stream_handle); + } + } + rcu_read_unlock(); + + /* All good, send back reply. */ + reply.ret_code = htobe32(LTTNG_OK); + + ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + if (ret < 0) { + ERR("Relay begin data pending send reply failed"); + } + +end_no_session: + return ret; +} + +/* + * End data pending command. This will check, for a given session id, if each + * stream associated with it has its data_pending_check_done flag set. If not, + * this means that the client lost track of the stream but the data is still + * being streamed on our side. In this case, we inform the client that data is + * inflight. + * + * Return to the client if there is data in flight or not with a ret_code. + */ +static +int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr, + struct relay_command *cmd) +{ + int ret; + struct lttng_ht_iter iter; + struct lttcomm_relayd_end_data_pending msg; + struct lttcomm_relayd_generic_reply reply; + struct relay_stream *stream; + uint64_t session_id; + uint32_t is_data_inflight = 0; + + assert(recv_hdr); + assert(cmd); + + DBG("End data pending command"); + + if (!cmd->session || cmd->version_check_done == 0) { + ERR("Trying to check for data before version check"); + ret = -1; + goto end_no_session; + } + + ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); + if (ret < sizeof(msg)) { + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } else { + ERR("Relay didn't receive valid end data_pending struct size: %d", + ret); + } + ret = -1; + goto end_no_session; + } + + session_id = be64toh(msg.session_id); + + /* Iterate over all streams to see if the begin data pending flag is set. */ + rcu_read_lock(); + cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream, + stream_n.node) { + if (stream->session->id == session_id && + !stream->data_pending_check_done) { + is_data_inflight = 1; + DBG("Data is still in flight for stream %" PRIu64, + stream->stream_handle); + break; + } + } + rcu_read_unlock(); + + /* All good, send back reply. */ + reply.ret_code = htobe32(is_data_inflight); + + ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + if (ret < 0) { + ERR("Relay end data pending send reply failed"); + } + +end_no_session: + return ret; +} + +/* + * Receive an index for a specific stream. + * + * Return 0 on success else a negative value. + */ +static +int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, + struct relay_command *cmd) +{ + int ret, send_ret, index_created = 0; + struct relay_session *session = cmd->session; + struct lttcomm_relayd_index index_info; + struct relay_index *index, *wr_index = NULL; + struct lttcomm_relayd_generic_reply reply; + struct relay_stream *stream; + uint64_t net_seq_num; + + assert(cmd); + + DBG("Relay receiving index"); + + if (!session || cmd->version_check_done == 0) { + ERR("Trying to close a stream before version check"); + ret = -1; + goto end_no_session; + } + + ret = cmd->sock->ops->recvmsg(cmd->sock, &index_info, + sizeof(index_info), 0); + if (ret < sizeof(index_info)) { + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } else { + ERR("Relay didn't receive valid index struct size : %d", ret); + } + ret = -1; + goto end_no_session; + } + + net_seq_num = be64toh(index_info.net_seq_num); + + rcu_read_lock(); + stream = relay_stream_find_by_id(be64toh(index_info.relay_stream_id)); + if (!stream) { + ret = -1; + goto end_rcu_unlock; + } + + /* Live beacon handling */ + if (index_info.packet_size == 0) { + DBG("Received live beacon for stream %" PRIu64, stream->stream_handle); + + /* + * Only flag a stream inactive when it has already received data. + */ + if (stream->total_index_received > 0) { + stream->beacon_ts_end = be64toh(index_info.timestamp_end); + } + ret = 0; + goto end_rcu_unlock; + } else { + stream->beacon_ts_end = -1ULL; + } + + index = relay_index_find(stream->stream_handle, net_seq_num); + if (!index) { + /* A successful creation will add the object to the HT. */ + index = relay_index_create(stream->stream_handle, net_seq_num); + if (!index) { + goto end_rcu_unlock; + } + index_created = 1; + } + + copy_index_control_data(index, &index_info); + + if (index_created) { + /* + * Try to add the relay index object to the hash table. If an object + * already exist, destroy back the index created, set the data in this + * object and write it on disk. + */ + relay_index_add(index, &wr_index); + if (wr_index) { + copy_index_control_data(wr_index, &index_info); + free(index); + } + } else { + /* The index already exists so write it on disk. */ + wr_index = index; + } + + /* Do we have a writable ready index to write on disk. */ + if (wr_index) { + /* Starting at 2.4, create the index file if none available. */ + if (cmd->minor >= 4 && stream->index_fd < 0) { + ret = index_create_file(stream->path_name, stream->channel_name, + relayd_uid, relayd_gid, stream->tracefile_size, + stream->tracefile_count_current); + if (ret < 0) { + goto end_rcu_unlock; + } + stream->index_fd = ret; + } + + ret = relay_index_write(wr_index->fd, wr_index); + if (ret < 0) { + goto end_rcu_unlock; + } + stream->total_index_received++; + } + +end_rcu_unlock: + rcu_read_unlock(); + + if (ret < 0) { + reply.ret_code = htobe32(LTTNG_ERR_UNK); + } else { + reply.ret_code = htobe32(LTTNG_OK); + } + send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + if (send_ret < 0) { + ERR("Relay sending close index id reply"); + ret = send_ret; + } + +end_no_session: return ret; } /* - * relay_process_control: Process the commands received on the control socket + * Process the commands received on the control socket */ static int relay_process_control(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd, struct lttng_ht *streams_ht) + struct relay_command *cmd, struct relay_local_data *ctx) { int ret = 0; switch (be32toh(recv_hdr->cmd)) { - /* case RELAYD_CREATE_SESSION: - ret = relay_create_session(recv_hdr, cmd); + ret = relay_create_session(recv_hdr, cmd, ctx->sessions_ht); break; - */ case RELAYD_ADD_STREAM: - ret = relay_add_stream(recv_hdr, cmd, streams_ht); + ret = relay_add_stream(recv_hdr, cmd, ctx->sessions_ht); break; case RELAYD_START_DATA: ret = relay_start(recv_hdr, cmd); break; case RELAYD_SEND_METADATA: - ret = relay_recv_metadata(recv_hdr, cmd, streams_ht); + ret = relay_recv_metadata(recv_hdr, cmd); break; case RELAYD_VERSION: - ret = relay_send_version(recv_hdr, cmd); + ret = relay_send_version(recv_hdr, cmd, ctx->sessions_ht); break; case RELAYD_CLOSE_STREAM: - ret = relay_close_stream(recv_hdr, cmd, streams_ht); + ret = relay_close_stream(recv_hdr, cmd); break; case RELAYD_DATA_PENDING: - ret = relay_data_pending(recv_hdr, cmd, streams_ht); + ret = relay_data_pending(recv_hdr, cmd); break; case RELAYD_QUIESCENT_CONTROL: ret = relay_quiescent_control(recv_hdr, cmd); break; + case RELAYD_BEGIN_DATA_PENDING: + ret = relay_begin_data_pending(recv_hdr, cmd); + break; + case RELAYD_END_DATA_PENDING: + ret = relay_end_data_pending(recv_hdr, cmd); + break; + case RELAYD_SEND_INDEX: + ret = relay_recv_index(recv_hdr, cmd); + break; case RELAYD_UPDATE_SYNC_INFO: default: ERR("Received unknown command (%u)", be32toh(recv_hdr->cmd)); @@ -1478,13 +1890,96 @@ end: return ret; } +/* + * Handle index for a data stream. + * + * RCU read side lock MUST be acquired. + * + * Return 0 on success else a negative value. + */ +static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num, + int rotate_index) +{ + int ret = 0, index_created = 0; + uint64_t stream_id, data_offset; + struct relay_index *index, *wr_index = NULL; + + assert(stream); + + stream_id = stream->stream_handle; + /* Get data offset because we are about to update the index. */ + data_offset = htobe64(stream->tracefile_size_current); + + /* + * Lookup for an existing index for that stream id/sequence number. If on + * exists, the control thread already received the data for it thus we need + * to write it on disk. + */ + index = relay_index_find(stream_id, net_seq_num); + if (!index) { + /* A successful creation will add the object to the HT. */ + index = relay_index_create(stream_id, net_seq_num); + if (!index) { + ret = -1; + goto error; + } + index_created = 1; + } + + if (rotate_index || stream->index_fd < 0) { + index->to_close_fd = stream->index_fd; + ret = index_create_file(stream->path_name, stream->channel_name, + relayd_uid, relayd_gid, stream->tracefile_size, + stream->tracefile_count_current); + if (ret < 0) { + /* This will close the stream's index fd if one. */ + relay_index_free_safe(index); + goto error; + } + stream->index_fd = ret; + } + index->fd = stream->index_fd; + index->index_data.offset = data_offset; + + if (index_created) { + /* + * Try to add the relay index object to the hash table. If an object + * already exist, destroy back the index created and set the data. + */ + relay_index_add(index, &wr_index); + if (wr_index) { + /* Copy back data from the created index. */ + wr_index->fd = index->fd; + wr_index->to_close_fd = index->to_close_fd; + wr_index->index_data.offset = data_offset; + free(index); + } + } else { + /* The index already exists so write it on disk. */ + wr_index = index; + } + + /* Do we have a writable ready index to write on disk. */ + if (wr_index) { + ret = relay_index_write(wr_index->fd, wr_index); + if (ret < 0) { + goto error; + } + stream->total_index_received++; + } + +error: + return ret; +} + /* * relay_process_data: Process the data received on the data socket */ static -int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht) +int relay_process_data(struct relay_command *cmd) { - int ret = 0; + int ret = 0, rotate_index = 0; + ssize_t size_ret; struct relay_stream *stream; struct lttcomm_relayd_data_hdr data_hdr; uint64_t stream_id; @@ -1494,7 +1989,12 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht) ret = cmd->sock->ops->recvmsg(cmd->sock, &data_hdr, sizeof(struct lttcomm_relayd_data_hdr), 0); if (ret <= 0) { - ERR("Connections seems to be closed"); + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } else { + ERR("Unable to receive data header on sock %d", cmd->sock->fd); + } ret = -1; goto end; } @@ -1502,22 +2002,24 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht) stream_id = be64toh(data_hdr.stream_id); rcu_read_lock(); - stream = relay_stream_from_stream_id(stream_id, streams_ht); + stream = relay_stream_find_by_id(stream_id); if (!stream) { ret = -1; - goto end_unlock; + goto end_rcu_unlock; } data_size = be32toh(data_hdr.data_size); if (data_buffer_size < data_size) { - char *tmp_data_ptr = data_buffer; - data_buffer = realloc(data_buffer, data_size); - if (!data_buffer) { + char *tmp_data_ptr; + + tmp_data_ptr = realloc(data_buffer, data_size); + if (!tmp_data_ptr) { ERR("Allocating data buffer"); - free(tmp_data_ptr); + free(data_buffer); ret = -1; - goto end_unlock; + goto end_rcu_unlock; } + data_buffer = tmp_data_ptr; data_buffer_size = data_size; } memset(data_buffer, 0, data_size); @@ -1528,17 +2030,92 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht) data_size, stream_id, net_seq_num); ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size, 0); if (ret <= 0) { + if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + } ret = -1; - goto end_unlock; + goto end_rcu_unlock; + } + + /* Check if a rotation is needed. */ + if (stream->tracefile_size > 0 && + (stream->tracefile_size_current + data_size) > + stream->tracefile_size) { + struct relay_viewer_stream *vstream; + uint64_t new_id; + + new_id = (stream->tracefile_count_current + 1) % + stream->tracefile_count; + /* + * When we wrap-around back to 0, we start overwriting old + * trace data. + */ + if (!stream->tracefile_overwrite && new_id == 0) { + stream->tracefile_overwrite = 1; + } + pthread_mutex_lock(&stream->viewer_stream_rotation_lock); + if (stream->tracefile_overwrite) { + stream->oldest_tracefile_id = + (stream->oldest_tracefile_id + 1) % + stream->tracefile_count; + } + vstream = live_find_viewer_stream_by_id(stream->stream_handle); + if (vstream) { + /* + * The viewer is reading a file about to be + * overwritten. Close the FDs it is + * currently using and let it handle the fault. + */ + if (vstream->tracefile_count_current == new_id) { + pthread_mutex_lock(&vstream->overwrite_lock); + vstream->abort_flag = 1; + pthread_mutex_unlock(&vstream->overwrite_lock); + DBG("Streaming side setting abort_flag on stream %s_%lu\n", + stream->channel_name, new_id); + } else if (vstream->tracefile_count_current == + stream->tracefile_count_current) { + /* + * The reader and writer were in the + * same trace file, inform the viewer + * that no new index will ever be added + * to this file. + */ + vstream->close_write_flag = 1; + } + } + ret = utils_rotate_stream_file(stream->path_name, stream->channel_name, + stream->tracefile_size, stream->tracefile_count, + relayd_uid, relayd_gid, stream->fd, + &(stream->tracefile_count_current), &stream->fd); + stream->total_index_received = 0; + pthread_mutex_unlock(&stream->viewer_stream_rotation_lock); + if (ret < 0) { + ERR("Rotating stream output file"); + goto end_rcu_unlock; + } + /* Reset current size because we just perform a stream rotation. */ + stream->tracefile_size_current = 0; + rotate_index = 1; } - do { - ret = write(stream->fd, data_buffer, data_size); - } while (ret < 0 && errno == EINTR); - if (ret < data_size) { + /* + * Index are handled in protocol version 2.4 and above. Also, snapshot and + * index are NOT supported. + */ + if (stream->session->minor >= 4 && !stream->session->snapshot) { + ret = handle_index_data(stream, net_seq_num, rotate_index); + if (ret < 0) { + goto end_rcu_unlock; + } + } + + /* Write data to stream output fd. */ + size_ret = lttng_write(stream->fd, data_buffer, data_size); + if (size_ret < data_size) { ERR("Relay error writing data to file"); ret = -1; - goto end_unlock; + goto end_rcu_unlock; } DBG2("Relay wrote %d bytes to tracefile for stream id %" PRIu64, @@ -1546,29 +2123,18 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht) ret = write_padding_to_file(stream->fd, be32toh(data_hdr.padding_size)); if (ret < 0) { - goto end_unlock; + goto end_rcu_unlock; } + stream->tracefile_size_current += data_size + be32toh(data_hdr.padding_size); stream->prev_seq = net_seq_num; /* Check if we need to close the FD */ if (close_stream_check(stream)) { - int cret; - struct lttng_ht_iter iter; - - cret = close(stream->fd); - if (cret < 0) { - PERROR("close stream process data"); - } - iter.iter.node = &stream->stream_n.node; - ret = lttng_ht_del(streams_ht, &iter); - assert(!ret); - call_rcu(&stream->rcu_node, - deferred_free_stream); - DBG("Closed tracefile %d after recv data", stream->fd); + destroy_stream(stream); } -end_unlock: +end_rcu_unlock: rcu_read_unlock(); end: return ret; @@ -1592,19 +2158,32 @@ int relay_add_connection(int fd, struct lttng_poll_event *events, struct lttng_ht *relay_connections_ht) { struct relay_command *relay_connection; - int ret; + ssize_t ret; relay_connection = zmalloc(sizeof(struct relay_command)); if (relay_connection == NULL) { PERROR("Relay command zmalloc"); goto error; } - ret = read(fd, relay_connection, sizeof(struct relay_command)); - if (ret < 0 || ret < sizeof(struct relay_command)) { + ret = lttng_read(fd, relay_connection, sizeof(struct relay_command)); + if (ret < sizeof(struct relay_command)) { PERROR("read relay cmd pipe"); goto error_read; } + /* + * Only used by the control side and the reference is copied inside each + * stream from that connection. Thus a destroy HT must be done after every + * stream has been destroyed. + */ + if (relay_connection->type == RELAY_CONTROL) { + relay_connection->ctf_traces_ht = lttng_ht_new(0, + LTTNG_HT_TYPE_STRING); + if (!relay_connection->ctf_traces_ht) { + goto error_read; + } + } + lttng_ht_node_init_ulong(&relay_connection->sock_n, (unsigned long) relay_connection->sock->fd); rcu_read_lock(); @@ -1633,19 +2212,20 @@ void deferred_free_connection(struct rcu_head *head) static void relay_del_connection(struct lttng_ht *relay_connections_ht, - struct lttng_ht *streams_ht, struct lttng_ht_iter *iter, - struct relay_command *relay_connection) + struct lttng_ht_iter *iter, struct relay_command *relay_connection, + struct lttng_ht *sessions_ht) { int ret; ret = lttng_ht_del(relay_connections_ht, iter); assert(!ret); + if (relay_connection->type == RELAY_CONTROL) { - relay_delete_session(relay_connection, streams_ht); + relay_delete_session(relay_connection, sessions_ht); + lttng_ht_destroy(relay_connection->ctf_traces_ht); } - call_rcu(&relay_connection->rcu_node, - deferred_free_connection); + call_rcu(&relay_connection->rcu_node, deferred_free_connection); } /* @@ -1654,30 +2234,35 @@ void relay_del_connection(struct lttng_ht *relay_connections_ht, static void *relay_thread_worker(void *data) { - int i, ret, pollfd, err = -1; - uint32_t revents, nb_fd; + int ret, err = -1, last_seen_data_fd = -1; + uint32_t nb_fd; struct relay_command *relay_connection; struct lttng_poll_event events; struct lttng_ht *relay_connections_ht; struct lttng_ht_node_ulong *node; struct lttng_ht_iter iter; - struct lttng_ht *streams_ht; struct lttcomm_relayd_hdr recv_hdr; + struct relay_local_data *relay_ctx = (struct relay_local_data *) data; + struct lttng_ht *sessions_ht = relay_ctx->sessions_ht; DBG("[thread] Relay worker started"); rcu_register_thread(); + health_register(health_relayd, HEALTH_RELAYD_TYPE_WORKER); + + health_code_update(); + /* table of connections indexed on socket */ relay_connections_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); if (!relay_connections_ht) { goto relay_connections_ht_error; } - /* tables of streams indexed by stream ID */ - streams_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); - if (!streams_ht) { - goto streams_ht_error; + /* Tables of received indexes indexed by index handle and net_seq_num. */ + indexes_ht = lttng_ht_new(0, LTTNG_HT_TYPE_TWO_U64); + if (!indexes_ht) { + goto indexes_ht_error; } ret = create_thread_poll_set(&events, 2); @@ -1690,16 +2275,17 @@ void *relay_thread_worker(void *data) goto error; } +restart: while (1) { - /* Zeroed the events structure */ - lttng_poll_reset(&events); + int idx = -1, i, seen_control = 0, last_notdel_data_fd = -1; - nb_fd = LTTNG_POLL_GETNB(&events); + health_code_update(); /* Infinite blocking call, waiting for transmission */ - restart: DBG3("Relayd worker thread polling..."); + health_poll_entry(); ret = lttng_poll_wait(&events, -1); + health_poll_exit(); if (ret < 0) { /* * Restart interrupted system call. @@ -1710,10 +2296,19 @@ void *relay_thread_worker(void *data) goto error; } + nb_fd = ret; + + /* + * Process control. The control connection is prioritised so we don't + * starve it with high throughout put tracing data on the data + * connection. + */ for (i = 0; i < nb_fd; i++) { /* Fetch once the poll data */ - revents = LTTNG_POLL_GETEV(&events, i); - pollfd = LTTNG_POLL_GETFD(&events, i); + uint32_t revents = LTTNG_POLL_GETEV(&events, i); + int pollfd = LTTNG_POLL_GETFD(&events, i); + + health_code_update(); /* Thread quit pipe has been closed. Killing thread. */ ret = check_thread_quit_pipe(pollfd, revents); @@ -1735,7 +2330,7 @@ void *relay_thread_worker(void *data) goto error; } } - } else if (revents > 0) { + } else if (revents) { rcu_read_lock(); lttng_ht_lookup(relay_connections_ht, (void *)((unsigned long) pollfd), @@ -1753,14 +2348,18 @@ void *relay_thread_worker(void *data) ERR("POLL ERROR"); relay_cleanup_poll_connection(&events, pollfd); relay_del_connection(relay_connections_ht, - streams_ht, &iter, - relay_connection); + &iter, relay_connection, sessions_ht); + if (last_seen_data_fd == pollfd) { + last_seen_data_fd = last_notdel_data_fd; + } } else if (revents & (LPOLLHUP | LPOLLRDHUP)) { DBG("Socket %d hung up", pollfd); relay_cleanup_poll_connection(&events, pollfd); relay_del_connection(relay_connections_ht, - streams_ht, &iter, - relay_connection); + &iter, relay_connection, sessions_ht); + if (last_seen_data_fd == pollfd) { + last_seen_data_fd = last_notdel_data_fd; + } } else if (revents & LPOLLIN) { /* control socket */ if (relay_connection->type == RELAY_CONTROL) { @@ -1771,8 +2370,7 @@ void *relay_thread_worker(void *data) if (ret <= 0) { relay_cleanup_poll_connection(&events, pollfd); relay_del_connection(relay_connections_ht, - streams_ht, &iter, - relay_connection); + &iter, relay_connection, sessions_ht); DBG("Control connection closed with %d", pollfd); } else { if (relay_connection->session) { @@ -1780,38 +2378,110 @@ void *relay_thread_worker(void *data) relay_connection->session->id); } ret = relay_process_control(&recv_hdr, - relay_connection, - streams_ht); - /* - * there was an error in processing a control - * command: clear the session - * */ + relay_connection, relay_ctx); if (ret < 0) { + /* Clear the session on error. */ relay_cleanup_poll_connection(&events, pollfd); relay_del_connection(relay_connections_ht, - streams_ht, &iter, - relay_connection); + &iter, relay_connection, sessions_ht); DBG("Connection closed with %d", pollfd); } + seen_control = 1; } - /* data socket */ - } else if (relay_connection->type == RELAY_DATA) { - ret = relay_process_data(relay_connection, streams_ht); - /* connection closed */ - if (ret < 0) { - relay_cleanup_poll_connection(&events, pollfd); - relay_del_connection(relay_connections_ht, - streams_ht, &iter, - relay_connection); - DBG("Data connection closed with %d", pollfd); - } + } else { + /* + * Flag the last seen data fd not deleted. It will be + * used as the last seen fd if any fd gets deleted in + * this first loop. + */ + last_notdel_data_fd = pollfd; + } + } + rcu_read_unlock(); + } + } + + /* + * The last loop handled a control request, go back to poll to make + * sure we prioritise the control socket. + */ + if (seen_control) { + continue; + } + + if (last_seen_data_fd >= 0) { + for (i = 0; i < nb_fd; i++) { + int pollfd = LTTNG_POLL_GETFD(&events, i); + + health_code_update(); + + if (last_seen_data_fd == pollfd) { + idx = i; + break; + } + } + } + + /* Process data connection. */ + for (i = idx + 1; i < nb_fd; i++) { + /* Fetch the poll data. */ + uint32_t revents = LTTNG_POLL_GETEV(&events, i); + int pollfd = LTTNG_POLL_GETFD(&events, i); + + health_code_update(); + + /* Skip the command pipe. It's handled in the first loop. */ + if (pollfd == relay_cmd_pipe[0]) { + continue; + } + + if (revents) { + rcu_read_lock(); + lttng_ht_lookup(relay_connections_ht, + (void *)((unsigned long) pollfd), + &iter); + node = lttng_ht_iter_get_node_ulong(&iter); + if (node == NULL) { + /* Skip it. Might be removed before. */ + rcu_read_unlock(); + continue; + } + relay_connection = caa_container_of(node, + struct relay_command, sock_n); + + if (revents & LPOLLIN) { + if (relay_connection->type != RELAY_DATA) { + continue; + } + + ret = relay_process_data(relay_connection); + /* connection closed */ + if (ret < 0) { + relay_cleanup_poll_connection(&events, pollfd); + relay_del_connection(relay_connections_ht, + &iter, relay_connection, sessions_ht); + DBG("Data connection closed with %d", pollfd); + /* + * Every goto restart call sets the last seen fd where + * here we don't really care since we gracefully + * continue the loop after the connection is deleted. + */ + } else { + /* Keep last seen port. */ + last_seen_data_fd = pollfd; + rcu_read_unlock(); + goto restart; } } rcu_read_unlock(); } } + last_seen_data_fd = -1; } + /* Normal exit, no error */ + ret = 0; + exit: error: lttng_poll_clean(&events); @@ -1819,19 +2489,20 @@ error: /* empty the hash table and free the memory */ rcu_read_lock(); cds_lfht_for_each_entry(relay_connections_ht->ht, &iter.iter, node, node) { + health_code_update(); + node = lttng_ht_iter_get_node_ulong(&iter); if (node) { relay_connection = caa_container_of(node, struct relay_command, sock_n); relay_del_connection(relay_connections_ht, - streams_ht, &iter, - relay_connection); + &iter, relay_connection, sessions_ht); } } rcu_read_unlock(); error_poll_create: - lttng_ht_destroy(streams_ht); -streams_ht_error: + lttng_ht_destroy(indexes_ht); +indexes_ht_error: lttng_ht_destroy(relay_connections_ht); relay_connections_ht_error: /* Close relay cmd pipes */ @@ -1841,8 +2512,13 @@ relay_connections_ht_error: } DBG("Worker thread cleanup complete"); free(data_buffer); - stop_threads(); + if (err) { + health_error(); + ERR("Health error occurred in %s", __func__); + } + health_unregister(health_relayd); rcu_unregister_thread(); + stop_threads(); return NULL; } @@ -1866,6 +2542,7 @@ int main(int argc, char **argv) { int ret = 0; void *status; + struct relay_local_data *relay_ctx; /* Create thread quit pipe */ if ((ret = init_thread_quit_pipe()) < 0) { @@ -1874,7 +2551,7 @@ int main(int argc, char **argv) /* Parse arguments */ progname = argv[0]; - if ((ret = parse_args(argc, argv) < 0)) { + if ((ret = parse_args(argc, argv)) < 0) { goto exit; } @@ -1882,6 +2559,20 @@ int main(int argc, char **argv) goto exit; } + /* Try to create directory if -o, --output is specified. */ + if (opt_output_path) { + if (*opt_output_path != '/') { + ERR("Please specify an absolute path for -o, --output PATH"); + goto exit; + } + + ret = utils_mkdir_recursive(opt_output_path, S_IRWXU | S_IRWXG); + if (ret < 0) { + ERR("Unable to create %s", opt_output_path); + goto exit; + } + } + /* Daemonize */ if (opt_daemon) { ret = daemon(0, 0); @@ -1891,10 +2582,12 @@ int main(int argc, char **argv) } } - /* Check if daemon is UID = 0 */ - is_root = !getuid(); + /* We need those values for the file/dir creation. */ + relayd_uid = getuid(); + relayd_gid = getgid(); - if (!is_root) { + /* Check if daemon is UID = 0 */ + if (relayd_uid == 0) { if (control_uri->port < 1024 || data_uri->port < 1024) { ERR("Need to be root to use ports < 1024"); ret = -1; @@ -1913,6 +2606,53 @@ int main(int argc, char **argv) /* Set up max poll set size */ lttng_poll_set_max_size(); + /* Initialize communication library */ + lttcomm_init(); + + relay_ctx = zmalloc(sizeof(struct relay_local_data)); + if (!relay_ctx) { + PERROR("relay_ctx"); + goto exit; + } + + /* tables of sessions indexed by session ID */ + relay_ctx->sessions_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); + if (!relay_ctx->sessions_ht) { + goto exit_relay_ctx_sessions; + } + + /* tables of streams indexed by stream ID */ + relay_streams_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); + if (!relay_streams_ht) { + goto exit_relay_ctx_streams; + } + + /* tables of streams indexed by stream ID */ + viewer_streams_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); + if (!viewer_streams_ht) { + goto exit_relay_ctx_viewer_streams; + } + + /* Initialize thread health monitoring */ + health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES); + if (!health_relayd) { + PERROR("health_app_create error"); + goto exit_health_app_create; + } + + ret = utils_create_pipe(health_quit_pipe); + if (ret < 0) { + goto error_health_pipe; + } + + /* Create thread to manage the client socket */ + ret = pthread_create(&health_thread, NULL, + thread_manage_health, (void *) NULL); + if (ret != 0) { + PERROR("pthread_create health"); + goto health_error; + } + /* Setup the dispatcher thread */ ret = pthread_create(&dispatcher_thread, NULL, relay_thread_dispatcher, (void *) NULL); @@ -1923,7 +2663,7 @@ int main(int argc, char **argv) /* Setup the worker thread */ ret = pthread_create(&worker_thread, NULL, - relay_thread_worker, (void *) NULL); + relay_thread_worker, (void *) relay_ctx); if (ret != 0) { PERROR("pthread_create worker"); goto exit_worker; @@ -1937,27 +2677,63 @@ int main(int argc, char **argv) goto exit_listener; } -exit_listener: + ret = live_start_threads(live_uri, relay_ctx, thread_quit_pipe); + if (ret != 0) { + ERR("Starting live viewer threads"); + goto exit_live; + } + +exit_live: ret = pthread_join(listener_thread, &status); if (ret != 0) { PERROR("pthread_join"); goto error; /* join error, exit without cleanup */ } -exit_worker: +exit_listener: ret = pthread_join(worker_thread, &status); if (ret != 0) { PERROR("pthread_join"); goto error; /* join error, exit without cleanup */ } -exit_dispatcher: +exit_worker: ret = pthread_join(dispatcher_thread, &status); if (ret != 0) { PERROR("pthread_join"); goto error; /* join error, exit without cleanup */ } +exit_dispatcher: + ret = pthread_join(health_thread, &status); + if (ret != 0) { + PERROR("pthread_join health thread"); + goto error; /* join error, exit without cleanup */ + } + + /* + * Stop live threads only after joining other threads. + */ + live_stop_threads(); + +health_error: + utils_close_pipe(health_quit_pipe); + +error_health_pipe: + health_app_destroy(health_relayd); + +exit_health_app_create: + lttng_ht_destroy(viewer_streams_ht); + +exit_relay_ctx_viewer_streams: + lttng_ht_destroy(relay_streams_ht); + +exit_relay_ctx_streams: + lttng_ht_destroy(relay_ctx->sessions_ht); + +exit_relay_ctx_sessions: + free(relay_ctx); + exit: cleanup(); if (!ret) {