Fix: Relay daemon ownership and reference counting

[lttng-tools.git] / src / common / index / index.c

diff --git a/src/common/index/index.c b/src/common/index/index.c
index 35cff533c59150171fa28ec880b473cc1cf3f784..46f8bcb1f02bfcb185782d65bb5e77fa8c4720cc 100644 (file)
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -51,7 +51,7 @@ int index_create_file(char *path_name, char *stream_name, int uid, int gid,
        }
 
        /* Create index directory if necessary. */
-       ret = run_as_mkdir(fullpath, S_IRWXU | S_IRWXG, uid, gid);
+       ret = utils_mkdir(fullpath, S_IRWXU | S_IRWXG, uid, gid);
        if (ret < 0) {
                if (ret != -EEXIST) {
                        PERROR("Index trace directory creation error");
@@ -59,6 +59,19 @@ int index_create_file(char *path_name, char *stream_name, int uid, int gid,
                }
        }
 
+       /*
+        * For tracefile rotation. We need to unlink the old
+        * file if present to synchronize with the tail of the
+        * live viewer which could be working on this same file.
+        * By doing so, any reference to the old index file
+        * stays valid even if we re-create a new file with the
+        * same name afterwards.
+        */
+       ret = utils_unlink_stream_file(fullpath, stream_name, size, count, uid,
+                       gid, DEFAULT_INDEX_FILE_SUFFIX);
+       if (ret < 0 && errno != ENOENT) {
+               goto error;
+       }
        ret = utils_create_stream_file(fullpath, stream_name, size, count, uid,
                        gid, DEFAULT_INDEX_FILE_SUFFIX);
        if (ret < 0) {