mirror of
https://github.com/Dasharo/systemd.git
synced 2026-03-06 15:02:31 -08:00
Merge pull request #26932 from dtardon/journal-vacuum
Count size of all journal files when vacuuming
This commit is contained in:
Lennart Poettering
GitHub
@@ -20,7 +20,7 @@
|
||||
#include "time-util.h"
|
||||
#include "xattr-util.h"
|
||||
|
||||
struct vacuum_info {
|
||||
typedef struct vacuum_info {
|
||||
uint64_t usage;
|
||||
char *filename;
|
||||
|
||||
@@ -29,9 +29,9 @@ struct vacuum_info {
|
||||
sd_id128_t seqnum_id;
|
||||
uint64_t seqnum;
|
||||
bool have_seqnum;
|
||||
};
|
||||
} vacuum_info;
|
||||
|
||||
static int vacuum_compare(const struct vacuum_info *a, const struct vacuum_info *b) {
|
||||
static int vacuum_info_compare(const vacuum_info *a, const vacuum_info *b) {
|
||||
int r;
|
||||
|
||||
if (a->have_seqnum && b->have_seqnum &&
|
||||
@@ -48,6 +48,16 @@ static int vacuum_compare(const struct vacuum_info *a, const struct vacuum_info
|
||||
return strcmp(a->filename, b->filename);
|
||||
}
|
||||
|
||||
static void vacuum_info_array_free(vacuum_info *list, size_t n) {
|
||||
if (!list)
|
||||
return;
|
||||
|
||||
FOREACH_ARRAY(i, list, n)
|
||||
free(i->filename);
|
||||
|
||||
free(list);
|
||||
}
|
||||
|
||||
static void patch_realtime(
|
||||
int fd,
|
||||
const char *fn,
|
||||
@@ -126,10 +136,12 @@ int journal_directory_vacuum(
|
||||
uint64_t sum = 0, freed = 0, n_active_files = 0;
|
||||
size_t n_list = 0, i;
|
||||
_cleanup_closedir_ DIR *d = NULL;
|
||||
struct vacuum_info *list = NULL;
|
||||
vacuum_info *list = NULL;
|
||||
usec_t retention_limit = 0;
|
||||
int r;
|
||||
|
||||
CLEANUP_ARRAY(list, n_list, vacuum_info_array_free);
|
||||
|
||||
assert(directory);
|
||||
|
||||
if (max_use <= 0 && max_retention_usec <= 0 && n_max_files <= 0)
|
||||
@@ -142,7 +154,7 @@ int journal_directory_vacuum(
|
||||
if (!d)
|
||||
return -errno;
|
||||
|
||||
FOREACH_DIRENT_ALL(de, d, r = -errno; goto finish) {
|
||||
FOREACH_DIRENT_ALL(de, d, return -errno) {
|
||||
unsigned long long seqnum = 0, realtime;
|
||||
_cleanup_free_ char *p = NULL;
|
||||
sd_id128_t seqnum_id;
|
||||
@@ -159,6 +171,8 @@ int journal_directory_vacuum(
|
||||
if (!S_ISREG(st.st_mode))
|
||||
continue;
|
||||
|
||||
size = 512UL * (uint64_t) st.st_blocks;
|
||||
|
||||
q = strlen(de->d_name);
|
||||
|
||||
if (endswith(de->d_name, ".journal")) {
|
||||
@@ -168,6 +182,7 @@ int journal_directory_vacuum(
|
||||
|
||||
if (q < 1 + 32 + 1 + 16 + 1 + 16 + 8) {
|
||||
n_active_files++;
|
||||
sum += size;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -175,23 +190,24 @@ int journal_directory_vacuum(
|
||||
de->d_name[q-8-16-1-16-1] != '-' ||
|
||||
de->d_name[q-8-16-1-16-1-32-1] != '@') {
|
||||
n_active_files++;
|
||||
sum += size;
|
||||
continue;
|
||||
}
|
||||
|
||||
p = strdup(de->d_name);
|
||||
if (!p) {
|
||||
r = -ENOMEM;
|
||||
goto finish;
|
||||
}
|
||||
if (!p)
|
||||
return -ENOMEM;
|
||||
|
||||
de->d_name[q-8-16-1-16-1] = 0;
|
||||
if (sd_id128_from_string(de->d_name + q-8-16-1-16-1-32, &seqnum_id) < 0) {
|
||||
n_active_files++;
|
||||
sum += size;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (sscanf(de->d_name + q-8-16-1-16, "%16llx-%16llx.journal", &seqnum, &realtime) != 2) {
|
||||
n_active_files++;
|
||||
sum += size;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -207,23 +223,24 @@ int journal_directory_vacuum(
|
||||
|
||||
if (q < 1 + 16 + 1 + 16 + 8 + 1) {
|
||||
n_active_files++;
|
||||
sum += size;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (de->d_name[q-1-8-16-1] != '-' ||
|
||||
de->d_name[q-1-8-16-1-16-1] != '@') {
|
||||
n_active_files++;
|
||||
sum += size;
|
||||
continue;
|
||||
}
|
||||
|
||||
p = strdup(de->d_name);
|
||||
if (!p) {
|
||||
r = -ENOMEM;
|
||||
goto finish;
|
||||
}
|
||||
if (!p)
|
||||
return -ENOMEM;
|
||||
|
||||
if (sscanf(de->d_name + q-1-8-16-1-16, "%16llx-%16llx.journal~", &realtime, &tmp) != 2) {
|
||||
n_active_files++;
|
||||
sum += size;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -234,8 +251,6 @@ int journal_directory_vacuum(
|
||||
continue;
|
||||
}
|
||||
|
||||
size = 512UL * (uint64_t) st.st_blocks;
|
||||
|
||||
r = journal_file_empty(dirfd(d), p);
|
||||
if (r < 0) {
|
||||
log_debug_errno(r, "Failed check if %s is empty, ignoring: %m", p);
|
||||
@@ -261,12 +276,10 @@ int journal_directory_vacuum(
|
||||
|
||||
patch_realtime(dirfd(d), p, &st, &realtime);
|
||||
|
||||
if (!GREEDY_REALLOC(list, n_list + 1)) {
|
||||
r = -ENOMEM;
|
||||
goto finish;
|
||||
}
|
||||
if (!GREEDY_REALLOC(list, n_list + 1))
|
||||
return -ENOMEM;
|
||||
|
||||
list[n_list++] = (struct vacuum_info) {
|
||||
list[n_list++] = (vacuum_info) {
|
||||
.filename = TAKE_PTR(p),
|
||||
.usage = size,
|
||||
.seqnum = seqnum,
|
||||
@@ -278,7 +291,7 @@ int journal_directory_vacuum(
|
||||
sum += size;
|
||||
}
|
||||
|
||||
typesafe_qsort(list, n_list, vacuum_compare);
|
||||
typesafe_qsort(list, n_list, vacuum_info_compare);
|
||||
|
||||
for (i = 0; i < n_list; i++) {
|
||||
uint64_t left;
|
||||
@@ -310,15 +323,8 @@ int journal_directory_vacuum(
|
||||
if (oldest_usec && i < n_list && (*oldest_usec == 0 || list[i].realtime < *oldest_usec))
|
||||
*oldest_usec = list[i].realtime;
|
||||
|
||||
r = 0;
|
||||
|
||||
finish:
|
||||
for (i = 0; i < n_list; i++)
|
||||
free(list[i].filename);
|
||||
free(list);
|
||||
|
||||
log_full(verbose ? LOG_INFO : LOG_DEBUG, "Vacuuming done, freed %s of archived journals from %s.",
|
||||
FORMAT_BYTES(freed), directory);
|
||||
|
||||
return r;
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user