projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumer_add_relayd_socket() report errors to sessiond
[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 211fc5a34df02b70de775c15880d526d26afe050..ed4d6c86f1a0b569892b0144c6f055a73983fbb1 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-721,7
+721,7
@@
static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
struct ltt_kernel_channel *kchan;
/* Open kernel metadata */
struct ltt_kernel_channel *kchan;
/* Open kernel metadata */
- if (ksess->metadata == NULL) {
+ if (ksess->metadata == NULL
&& ksess->output_traces
) {
ret = kernel_open_metadata(ksess);
if (ret < 0) {
ret = LTTNG_ERR_KERN_META_FAIL;
ret = kernel_open_metadata(ksess);
if (ret < 0) {
ret = LTTNG_ERR_KERN_META_FAIL;
@@
-730,7
+730,7
@@
static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
}
/* Open kernel metadata stream */
}
/* Open kernel metadata stream */
- if (ksess->metadata_stream_fd < 0) {
+ if (ksess->metadata
&& ksess->metadata
_stream_fd < 0) {
ret = kernel_open_metadata_stream(ksess);
if (ret < 0) {
ERR("Kernel create metadata stream failed");
ret = kernel_open_metadata_stream(ksess);
if (ret < 0) {
ERR("Kernel create metadata stream failed");
@@
-2374,8
+2374,8
@@
static int set_relayd_for_snapshot(struct consumer_output *consumer,
* snapshot output.
*/
rcu_read_lock();
* snapshot output.
*/
rcu_read_lock();
- cds_lfht_for_each_entry(
consumer->socks->ht, &iter.iter, socket
,
- node.node) {
+ cds_lfht_for_each_entry(
snap_output->consumer->socks->ht, &iter.iter
,
+
socket,
node.node) {
ret = send_consumer_relayd_sockets(0, session->id,
snap_output->consumer, socket);
if (ret < 0) {
ret = send_consumer_relayd_sockets(0, session->id,
snap_output->consumer, socket);
if (ret < 0) {
This page took
0.02398 seconds
and
4
git commands to generate.