From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] tools/logrotate: fix compression logic
Date: Wed, 28 Oct 2020 10:58:00 +0100 [thread overview]
Message-ID: <20201028095801.1737-1-d.csapak@proxmox.com> (raw)
we never actually compressed any files, since we only looked at
the extension:
* if it was 'zst' (which was always true for newly rotated files), we
would not compress it
* even if it was not 'zst', we compressed it inplace, never adding '.zst'
(possibly compressing them multiple times as zstd)
now we add new rotated files simply as '.X' and add a 'target' to the
compress fn, where we rename it to (but now we have to unlink the source
path)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/tools/logrotate.rs | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/tools/logrotate.rs b/src/tools/logrotate.rs
index 0a8203a9..13c73a76 100644
--- a/src/tools/logrotate.rs
+++ b/src/tools/logrotate.rs
@@ -46,9 +46,9 @@ impl LogRotate {
}
}
- fn compress(file: &PathBuf, options: &CreateOptions) -> Result<(), Error> {
- let mut source = File::open(file)?;
- let (fd, tmp_path) = make_tmp_file(file, options.clone())?;
+ fn compress(source_path: &PathBuf, target_path: &PathBuf, options: &CreateOptions) -> Result<(), Error> {
+ let mut source = File::open(source_path)?;
+ let (fd, tmp_path) = make_tmp_file(target_path, options.clone())?;
let target = unsafe { File::from_raw_fd(fd) };
let mut encoder = match zstd::stream::write::Encoder::new(target, 0) {
Ok(encoder) => encoder,
@@ -60,18 +60,23 @@ impl LogRotate {
if let Err(err) = std::io::copy(&mut source, &mut encoder) {
let _ = unistd::unlink(&tmp_path);
- bail!("zstd encoding failed for file {:?} - {}", file, err);
+ bail!("zstd encoding failed for file {:?} - {}", target_path, err);
}
if let Err(err) = encoder.finish() {
let _ = unistd::unlink(&tmp_path);
- bail!("zstd finish failed for file {:?} - {}", file, err);
+ bail!("zstd finish failed for file {:?} - {}", target_path, err);
}
- if let Err(err) = rename(&tmp_path, file) {
+ if let Err(err) = rename(&tmp_path, target_path) {
let _ = unistd::unlink(&tmp_path);
- bail!("rename failed for file {:?} - {}", file, err);
+ bail!("rename failed for file {:?} - {}", target_path, err);
}
+
+ if let Err(err) = unistd::unlink(source_path) {
+ bail!("unlink failed for file {:?} - {}", source_path, err);
+ }
+
Ok(())
}
@@ -80,9 +85,8 @@ impl LogRotate {
///
/// e.g. rotates
/// foo.2.zst => foo.3.zst
- /// foo.1.zst => foo.2.zst
- /// foo => foo.1.zst
- /// => foo
+ /// foo.1 => foo.2.zst
+ /// foo => foo.1
pub fn do_rotate(&mut self, options: CreateOptions, max_files: Option<usize>) -> Result<(), Error> {
let mut filenames: Vec<PathBuf> = self.file_names().collect();
if filenames.is_empty() {
@@ -90,12 +94,7 @@ impl LogRotate {
}
let mut next_filename = self.base_path.clone().canonicalize()?.into_os_string();
-
- if self.compress {
- next_filename.push(format!(".{}.zst", filenames.len()));
- } else {
- next_filename.push(format!(".{}", filenames.len()));
- }
+ next_filename.push(format!(".{}", filenames.len()));
filenames.push(PathBuf::from(next_filename));
let count = filenames.len();
@@ -105,9 +104,11 @@ impl LogRotate {
}
if self.compress {
- for i in 2..count-1 {
+ for i in 2..count {
if filenames[i].extension().unwrap_or(std::ffi::OsStr::new("")) != "zst" {
- Self::compress(&filenames[i], &options)?;
+ let mut target = filenames[i].clone().into_os_string();
+ target.push(".zstd");
+ Self::compress(&filenames[i], &target.into(), &options)?;
}
}
}
--
2.20.1
next reply other threads:[~2020-10-28 9:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 9:58 Dominik Csapak [this message]
2020-10-28 9:58 ` [pbs-devel] [RFC PATCH proxmox-backup 2/2] server/worker_task: simplify task log writing Dominik Csapak
2020-10-28 17:57 ` Thomas Lamprecht
2020-10-28 17:51 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] tools/logrotate: fix compression logic Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201028095801.1737-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox