X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=bba90f1ac6b8026e1886aef4fbf28a3c1426f9a4;hp=6181520fa7362b8b18732658fde146534a7dde01;hb=343defc2671db532be8a9eed84907fd2e4044f0e;hpb=cbf53d23cecaca9c6ec71582663c4a8254a9f285

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 6181520fa..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
@@ -816,7 +820,7 @@ end:
 LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_open_file(
 		struct lttng_trace_chunk *chunk, const char *file_path,
-		int flags, mode_t mode, int *out_fd)
+		int flags, mode_t mode, int *out_fd, bool expect_no_file)
 {
 	int ret;
 	enum lttng_trace_chunk_status status = LTTNG_TRACE_CHUNK_STATUS_OK;
@@ -844,9 +848,13 @@ enum lttng_trace_chunk_status lttng_trace_chunk_open_file(
 			chunk->credentials.value.use_current_user ?
 					NULL : &chunk->credentials.value.user);
 	if (ret < 0) {
-		PERROR("Failed to open file relative to trace chunk file_path = \"%s\", flags = %d, mode = %d",
+		if (errno == ENOENT && expect_no_file) {
+			status = LTTNG_TRACE_CHUNK_STATUS_NO_FILE;
+		} else {
+			PERROR("Failed to open file relative to trace chunk file_path = \"%s\", flags = %d, mode = %d",
 				file_path, flags, (int) mode);
-		status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
+			status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
+		}
 		goto end;
 	}
 	*out_fd = ret;
@@ -1074,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;
@@ -1087,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();
 	}