[pbs-devel] [PATCH proxmox-backup 2/2] rest-server: add option to rotate task logs by 'max_days' instead of 'max_files'
Dominik Csapak
d.csapak at proxmox.com
Fri Mar 25 12:43:41 CET 2022
and use it with the configurable: 'task_log_max_days' of the node config
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
proxmox-rest-server/src/worker_task.rs | 49 +++++++++++++++++++++++---
src/bin/proxmox-backup-proxy.rs | 6 ++++
2 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs
index 643e1872..fa3bc327 100644
--- a/proxmox-rest-server/src/worker_task.rs
+++ b/proxmox-rest-server/src/worker_task.rs
@@ -208,14 +208,16 @@ pub fn init_worker_tasks(basedir: PathBuf, file_opts: CreateOptions) -> Result<(
}
/// 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(
size_threshold: u64,
compress: bool,
max_files: Option<usize>,
+ max_days: Option<usize>,
options: Option<CreateOptions>,
) -> Result<bool, Error> {
-
let setup = worker_task_setup()?;
let _lock = setup.lock_task_list_files(true)?;
@@ -223,11 +225,50 @@ pub fn rotate_task_log_archive(
let mut logrotate = LogRotate::new(
&setup.task_archive_fn,
compress,
- max_files,
+ 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
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index a4f20af1..bf57469f 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -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_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 options = proxmox_sys::fs::CreateOptions::new()
.owner(user.uid)
@@ -856,6 +861,7 @@ async fn schedule_task_log_rotate() {
max_size,
true,
Some(max_files),
+ max_days,
Some(options.clone()),
)?;
--
2.30.2
More information about the pbs-devel
mailing list