Fix: sessiond: error reported on session destruction for old modules

[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 2bd010f895c223f83136f1c234f8bead46fbe339..e45d4423ac0e0a51b123f2c0275e13f981c9f763 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -3402,9 +3402,17 @@ int cmd_destroy_session(struct ltt_session *session,
                 */
                ret = cmd_rotate_session(session, NULL, true,
                        LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION);
-               if (ret != LTTNG_OK) {
+               /*
+                * Rotation operations may not be supported by the kernel
+                * tracer. Hence, do not consider this implicit rotation as
+                * a session destruction error. The library has already stopped
+                * the session and waited for pending data; there is nothing
+                * left to do but complete the destruction of the session.
+                */
+               if (ret != LTTNG_OK &&
+                               ret != -LTTNG_ERR_ROTATION_NOT_AVAILABLE_KERNEL) {
                        ERR("Failed to perform a quiet rotation as part of the destruction of session \"%s\": %s",
-                                       session->name, lttng_strerror(-ret));
+                           session->name, lttng_strerror(ret));
                        destruction_last_error = -ret;
                }
        }