From: Jonathan Rajotte Date: Tue, 27 Mar 2018 18:37:32 +0000 (-0400) Subject: Fix: use metadata key instead of fd for consumer rotation command X-Git-Tag: v2.11.0-rc1~338 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=22a1b9316f04f95a904ea724ad51aabcc389aca0;p=lttng-tools.git Fix: use metadata key instead of fd for consumer rotation command Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c index ccf315d89..2b59fe09d 100644 --- a/src/bin/lttng-sessiond/kernel.c +++ b/src/bin/lttng-sessiond/kernel.c @@ -1169,7 +1169,7 @@ int kernel_rotate_session(struct ltt_session *session) * reach 0 before we complete the iteration over all * the channels. */ - ret = rotate_add_channel_pending(ksess->metadata->fd, + ret = rotate_add_channel_pending(ksess->metadata->key, LTTNG_DOMAIN_KERNEL, session); if (ret < 0) { ret = LTTNG_ERR_KERN_CONSUMER_FAIL; @@ -1201,7 +1201,7 @@ int kernel_rotate_session(struct ltt_session *session) /* * Rotate the metadata channel. */ - ret = consumer_rotate_channel(socket, ksess->metadata->fd, + ret = consumer_rotate_channel(socket, ksess->metadata->key, ksess->uid, ksess->gid, ksess->consumer, ksess->consumer->subdir, /* is_metadata_channel */ true,