From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 27 Mar 2019 19:42:19 +0000 (-0400)
Subject: Fix: wrong error code returned by kernel_snapshot_record()
X-Git-Tag: v2.10.7~22
X-Git-Url: http://git.liburcu.org/?p=lttng-tools.git;a=commitdiff_plain;h=c1fcc06acaf11e0aa324aa9c26870d6a0f457728

Fix: wrong error code returned by kernel_snapshot_record()

On snapshot error, kernel_snapshot_record() can return
LTTNG_ERR_KERN_CONSUMER_FAIL which means that the kernel consumer
daemon failed to launch. In this path, the appropriate error to
return is LTTNG_ERR_KERN_META_FAIL.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 8892e76dc..760db52ea 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -1023,7 +1023,7 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 		/* Put back the saved consumer output into the session. */
 		ksess->consumer = saved_output;
 		if (ret < 0) {
-			ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+			ret = LTTNG_ERR_KERN_META_FAIL;
 			goto error_consumer;
 		}