X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=bba90f1ac6b8026e1886aef4fbf28a3c1426f9a4;hp=aadb40f6f68383a174304cc912c2beb2880a86fd;hb=343defc2671db532be8a9eed84907fd2e4044f0e;hpb=eacb7b6f2773556e31efb5e5d53d888c004b8f2f

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index aadb40f6f..bba90f1ac 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -111,6 +111,10 @@ static const
 char *close_command_names[] = {
 	[LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED] =
 		"move to completed chunk folder",
+	[LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION] =
+		"no operation",
+	[LTTNG_TRACE_CHUNK_COMMAND_TYPE_DELETE] =
+		"delete",
 };
 
 static const
@@ -1078,7 +1082,15 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_close_command(
 		DBG("Setting trace chunk close command to \"%s\"",
 				close_command_names[close_command]);
         }
-	LTTNG_OPTIONAL_SET(&chunk->close_command, close_command);
+	/*
+	 * Unset close command for no-op for backward compatibility with relayd
+	 * 2.11.
+	 */
+	if (close_command != LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION) {
+		LTTNG_OPTIONAL_SET(&chunk->close_command, close_command);
+	} else {
+		LTTNG_OPTIONAL_UNSET(&chunk->close_command);
+	}
 	pthread_mutex_unlock(&chunk->lock);
 end:
 	return status;
@@ -1091,6 +1103,10 @@ const char *lttng_trace_chunk_command_type_get_name(
 	switch (command) {
 	case LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED:
 		return "move to completed trace chunk folder";
+	case LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION:
+		return "no operation";
+	case LTTNG_TRACE_CHUNK_COMMAND_TYPE_DELETE:
+		return "delete";
 	default:
 		abort();
 	}