X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=5e6042e85671b88ad0b12dd5ea848b51b84529c2;hb=12ee10566a873fe94e6c0f8498e052672b8ed9b9;hp=16c64cbf9f20f8a51065d9571897745c3e48e589;hpb=f5b6db9e38b98e684b9edc3e4402d38709c6c8e1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 16c64cbf9..5e6042e85 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2017 - Julien Desfossez <jdesfossez@efficios.com>
- * Copyright (C) 2018 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -35,6 +25,8 @@
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <lttng/notification/channel-internal.h>
 #include <lttng/rotate-internal.h>
+#include <lttng/location-internal.h>
+#include <lttng/condition/condition-internal.h>
 
 #include "rotation-thread.h"
 #include "lttng-sessiond.h"
@@ -488,7 +480,6 @@ int check_session_rotation_pending(struct ltt_session *session,
 
 	if (!session->quiet_rotation) {
 		location = session_get_trace_archive_location(session);
-		/* Ownership of location is transferred. */
 		ret = notification_thread_command_session_rotation_completed(
 				notification_thread_handle,
 				session->name,
@@ -496,6 +487,7 @@ int check_session_rotation_pending(struct ltt_session *session,
 				session->gid,
 				session->last_archived_chunk_id.value,
 				location);
+		lttng_trace_archive_location_put(location);
 		if (ret != LTTNG_OK) {
 			ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
 					session->name);
@@ -537,7 +529,8 @@ int launch_session_rotation(struct ltt_session *session)
 	DBG("[rotation-thread] Launching scheduled time-based rotation on session \"%s\"",
 			session->name);
 
-	ret = cmd_rotate_session(session, &rotation_return, false);
+	ret = cmd_rotate_session(session, &rotation_return, false,
+		LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
 	if (ret == LTTNG_OK) {
 		DBG("[rotation-thread] Scheduled time-based rotation successfully launched on session \"%s\"",
 				session->name);
@@ -594,8 +587,7 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 		session_lock_list();
 		session = job->session;
 		if (!session) {
-			DBG("[rotation-thread] Session \"%s\" not found",
-					session->name);
+			DBG("[rotation-thread] Session not found");
 			/*
 			 * This is a non-fatal error, and we cannot report it to
 			 * the user (timer), so just print the error and
@@ -607,7 +599,6 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 			 * already been queued before it was destroyed.
 			 */
 			free(job);
-			session_put(session);
 			session_unlock_list();
 			continue;
 		}
@@ -670,10 +661,14 @@ int handle_condition(const struct lttng_condition *condition,
 	session_lock_list();
 	session = session_find_by_name(condition_session_name);
 	if (!session) {
-		ret = -1;
-		session_unlock_list();
-		ERR("[rotation-thread] Session \"%s\" not found",
+		DBG("[rotation-thread] Failed to find session while handling notification: session name = `%s`",
 				condition_session_name);
+		/*
+		 * Not a fatal error: a session can be destroyed before we get
+		 * the chance to handle the notification.
+		 */
+		ret = 0;
+		session_unlock_list();
 		goto end;
 	}
 	session_lock(session);
@@ -684,7 +679,8 @@ int handle_condition(const struct lttng_condition *condition,
 		goto end_unlock;
 	}
 
-	ret = cmd_rotate_session(session, NULL, false);
+	ret = cmd_rotate_session(session, NULL, false,
+		LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
 	if (ret == -LTTNG_ERR_ROTATION_PENDING) {
 		DBG("Rotate already pending, subscribe to the next threshold value");
 	} else if (ret != LTTNG_OK) {
@@ -769,6 +765,7 @@ end:
 	return ret;
 }
 
+static
 void *thread_rotation(void *data)
 {
 	int ret;