rest-server: add option to rotate task logs by 'max_days' instead of 'max_files'

and use it with the configurable: 'task_log_max_days' of the node config

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-03-28 09:54:19 +02:00 committed by Thomas Lamprecht
parent eb419c5267
commit 416194d799
2 changed files with 56 additions and 3 deletions

View File

@ -211,20 +211,67 @@ pub fn init_worker_tasks(basedir: PathBuf, file_opts: CreateOptions) -> Result<(
} }
/// checks if the Task Archive is bigger that 'size_threshold' bytes, and /// checks if the Task Archive is bigger that 'size_threshold' bytes, and
/// rotates it if it is /// rotates it if it is, keeps only up to 'max_files'.
/// If 'max_days' is given, 'max_files' is ignored, and all archive files
/// will be deleted where there are only tasks that are older than the given days.
pub fn rotate_task_log_archive( pub fn rotate_task_log_archive(
size_threshold: u64, size_threshold: u64,
compress: bool, compress: bool,
max_files: Option<usize>, max_files: Option<usize>,
max_days: Option<usize>,
options: Option<CreateOptions>, options: Option<CreateOptions>,
) -> Result<bool, Error> { ) -> Result<bool, Error> {
let setup = worker_task_setup()?; let setup = worker_task_setup()?;
let _lock = setup.lock_task_list_files(true)?; let _lock = setup.lock_task_list_files(true)?;
let mut logrotate = LogRotate::new(&setup.task_archive_fn, compress, max_files, options)?; let mut logrotate = LogRotate::new(
&setup.task_archive_fn,
compress,
if max_days.is_none() { max_files } else { None },
options,
)?;
logrotate.rotate(size_threshold) let mut rotated = logrotate.rotate(size_threshold)?;
if let Some(max_days) = max_days {
let mut delete = false;
let file_names = logrotate.file_names();
let mut files = logrotate.files();
for file_name in file_names {
if !delete {
// we only have to check if we did not start deleting already
// this is ok because the task log files are locked, so no one
// else should modify these
let reader = match files.next() {
Some(file) => BufReader::new(file),
None => {
bail!("unexpected error: files do not match file_names");
}
};
if let Some(line) = reader.lines().next() {
if let Ok((_, _, Some(state))) = parse_worker_status_line(&line?) {
// we approximate here with the days, but should be close enough
let cutoff_time =
proxmox_time::epoch_i64() - (max_days * 24 * 60 * 60) as i64;
if state.endtime() < cutoff_time {
// we found the first file that has only older entries, start deleting
delete = true;
rotated = true;
}
}
}
}
if delete {
if let Err(err) = std::fs::remove_file(&file_name) {
log::error!("could not remove {:?}: {}", file_name, err);
}
}
}
}
Ok(rotated)
} }
/// removes all task logs that are older than the oldest task entry in the /// removes all task logs that are older than the oldest task entry in the

View File

@ -847,6 +847,11 @@ async fn schedule_task_log_rotate() {
let max_size = 512 * 1024 - 1; // an entry has ~ 100b, so > 5000 entries/file let max_size = 512 * 1024 - 1; // an entry has ~ 100b, so > 5000 entries/file
let max_files = 20; // times twenty files gives > 100000 task entries let max_files = 20; // times twenty files gives > 100000 task entries
let max_days = proxmox_backup::config::node::config()
.map(|(cfg, _)| cfg.task_log_max_days)
.ok()
.flatten();
let user = pbs_config::backup_user()?; let user = pbs_config::backup_user()?;
let options = proxmox_sys::fs::CreateOptions::new() let options = proxmox_sys::fs::CreateOptions::new()
.owner(user.uid) .owner(user.uid)
@ -856,6 +861,7 @@ async fn schedule_task_log_rotate() {
max_size, max_size,
true, true,
Some(max_files), Some(max_files),
max_days,
Some(options.clone()), Some(options.clone()),
)?; )?;