rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Clean tmp directories when finishing

Browse Source 
There were leftover temporal directories when using the OVNI_TMPDIR
variable, as we only remove the proccess ones. This change only attempts
to remove them if they are empty, and doesn't care about race
conditions. The removal process is just "best effort".
This commit is contained in:
Rodrigo Arias 2023-11-16 12:01:30 +01:00
parent e002db72fd
commit 3267ea873f
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/rt/ovni.c
View File

@ -43,6 +43,8 @@ struct ovni_rproc {
/* Where the process trace is flushed */ /* Where the process trace is flushed */
char procdir[PATH_MAX]; char procdir[PATH_MAX];
char loomdir[PATH_MAX];
char tmpdir[PATH_MAX];
/* If needs to be moved at the end */ /* If needs to be moved at the end */
int move_to_final; int move_to_final;
@ -270,7 +272,12 @@ create_proc_dir(const char *loom, int pid)
if (tracedir == NULL) if (tracedir == NULL)
tracedir = OVNI_TRACEDIR; tracedir = OVNI_TRACEDIR;
if (snprintf(rproc.loomdir, PATH_MAX, "%s/loom.%s", tmpdir, loom) >= PATH_MAX)
die("loom path too long: %s/loom.%s", tmpdir, loom);
if (tmpdir != NULL) { if (tmpdir != NULL) {
if (snprintf(rproc.tmpdir, PATH_MAX, "%s", tmpdir) >= PATH_MAX)
die("tmpdir path too long: %s", tmpdir);
rproc.move_to_final = 1; rproc.move_to_final = 1;
mkdir_proc(rproc.procdir, tmpdir, loom, pid); mkdir_proc(rproc.procdir, tmpdir, loom, pid);
mkdir_proc(rproc.procdir_final, tracedir, loom, pid); mkdir_proc(rproc.procdir_final, tracedir, loom, pid);
@ -384,16 +391,19 @@ move_procdir_to_final(const char *procdir, const char *procdir_final)
closedir(dir); closedir(dir);
if (rmdir(procdir) != 0) {
err("rmdir(%s) failed:", procdir);
ret = 1;
}
/* Warn the user, but we cannot do much at this point */ /* Warn the user, but we cannot do much at this point */
if (ret) if (ret)
err("errors occurred when moving the trace to %s", procdir_final); err("errors occurred when moving the trace to %s", procdir_final);
} }
static void
try_clean_dir(const char *dir)
{
/* Only warn if we find an unexpected error */
if (rmdir(dir) != 0 && errno != ENOTEMPTY && errno != ENOENT)
warn("cannot remove dir %s:", dir);
}
void void
ovni_proc_fini(void) ovni_proc_fini(void)
{ {
@ -406,6 +416,9 @@ ovni_proc_fini(void)
if (rproc.move_to_final) { if (rproc.move_to_final) {
proc_metadata_store(rproc.meta, rproc.procdir_final); proc_metadata_store(rproc.meta, rproc.procdir_final);
move_procdir_to_final(rproc.procdir, rproc.procdir_final); move_procdir_to_final(rproc.procdir, rproc.procdir_final);
try_clean_dir(rproc.procdir);
try_clean_dir(rproc.loomdir);
try_clean_dir(rproc.tmpdir);
} else { } else {
proc_metadata_store(rproc.meta, rproc.procdir); proc_metadata_store(rproc.meta, rproc.procdir);
} }