X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=7b7642ea76baf2e20e759f618742ab5c0a06d688;hb=0359fdbc0ea4d96968e2ff493f713156d4646acb;hp=aea667cd116d2fea0132bffec7782b065fc71536;hpb=3e3665b89947ebdd812bcfaca1090d22b34d5778;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index aea667cd1..7b7642ea7 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -478,7 +478,7 @@ static int create_kernel_session(struct ltt_session *session)
 
 	DBG("Creating kernel session");
 
-	ret = kernel_create_session(session, kernel_tracer_fd);
+	ret = kernel_create_session(session);
 	if (ret < 0) {
 		ret = LTTNG_ERR_KERN_SESS_FAIL;
 		goto error_create;
@@ -879,6 +879,15 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 			goto error;
 		}
 
+		/* Kernel tracer check */
+		if (!kernel_tracer_is_initialized()) {
+			/* Basically, load kernel tracer modules */
+			ret = init_kernel_tracer();
+			if (ret != 0) {
+				goto error;
+			}
+		}
+
 		/* Consumer is in an ERROR state. Report back to client */
 		if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) {
 			ret = LTTNG_ERR_NO_KERNCONSUMERD;
@@ -1835,7 +1844,8 @@ error_add_context:
 			goto error;
 		}
 
-		ret = cmd_rotate_session(cmd_ctx->session, &rotate_return);
+		ret = cmd_rotate_session(cmd_ctx->session, &rotate_return,
+				false);
 		if (ret < 0) {
 			ret = -ret;
 			goto error;