diff options
| author | David Tardon <dtardon@redhat.com> | 2023-03-22 12:36:54 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2023-03-23 09:16:35 +0100 |
| commit | 9ea46af4f2368b41d57705bac09774778126507f (patch) | |
| tree | 0be6368a4e6ff32105f647f58c3b0a65304d0eb7 /src/libsystemd/sd-journal | |
| parent | 206760a4bc2e89ce7cec60b3f22a0a17bf2f9455 (diff) | |
| download | systemd-9ea46af4f2368b41d57705bac09774778126507f.tar.gz | |
journal-vacuum: count size of all journal files
Currently, active journal files are excluded, which means that vacuuming
may not remove anything even if *MaxUse= has been exceeded.
Diffstat (limited to 'src/libsystemd/sd-journal')
| -rw-r--r-- | src/libsystemd/sd-journal/journal-vacuum.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libsystemd/sd-journal/journal-vacuum.c b/src/libsystemd/sd-journal/journal-vacuum.c index d62cf3eb3a..7395d00bd4 100644 --- a/src/libsystemd/sd-journal/journal-vacuum.c +++ b/src/libsystemd/sd-journal/journal-vacuum.c @@ -159,6 +159,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 +170,7 @@ int journal_directory_vacuum( if (q < 1 + 32 + 1 + 16 + 1 + 16 + 8) { n_active_files++; + sum += size; continue; } @@ -175,6 +178,7 @@ 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; } @@ -187,11 +191,13 @@ int journal_directory_vacuum( 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,12 +213,14 @@ 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; } @@ -224,6 +232,7 @@ int journal_directory_vacuum( 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 +243,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); |