From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [RFC PATCH proxmox-backup 1/3] api-types: make UploadStatistic an api type
Date: Tue, 1 Aug 2023 11:29:52 +0200 [thread overview]
Message-ID: <20230801092954.1686860-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20230801092954.1686860-1-d.csapak@proxmox.com>
and move it to pbs_api_types. We'll want this to expose on the api.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
pbs-api-types/src/datastore.rs | 38 ++++++++++++++++++++++++++++++++++
src/api2/backup/environment.rs | 35 +------------------------------
2 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index 73c4890e..41db680c 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -419,6 +419,44 @@ pub struct SnapshotVerifyState {
pub state: VerifyState,
}
+#[api()]
+#[derive(Copy, Clone, Serialize, Deserialize)]
+/// Chunk upload statistics of a snapshot
+pub struct UploadStatistic {
+ /// Amount of chunks uploaded (incl. duplicates)
+ pub count: u64,
+ /// Uncompressed bytes uploaded
+ pub size: u64,
+ /// Compressed bytes uploaded
+ pub compressed_size: u64,
+ /// Amount of duplicate chunks uploaded
+ pub duplicates: u64,
+}
+
+impl UploadStatistic {
+ pub fn new() -> Self {
+ Self {
+ count: 0,
+ size: 0,
+ compressed_size: 0,
+ duplicates: 0,
+ }
+ }
+}
+
+impl std::ops::Add for UploadStatistic {
+ type Output = Self;
+
+ fn add(self, other: Self) -> Self {
+ Self {
+ count: self.count + other.count,
+ size: self.size + other.size,
+ compressed_size: self.compressed_size + other.compressed_size,
+ duplicates: self.duplicates + other.duplicates,
+ }
+ }
+}
+
/// A namespace provides a logical separation between backup groups from different domains
/// (cluster, sites, ...) where uniqueness cannot be guaranteed anymore. It allows users to share a
/// datastore (i.e., one deduplication domain (chunk store)) with multiple (trusted) sites and
diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs
index 5291bce8..0188bffc 100644
--- a/src/api2/backup/environment.rs
+++ b/src/api2/backup/environment.rs
@@ -3,13 +3,12 @@ use nix::dir::Dir;
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
-use ::serde::Serialize;
use serde_json::{json, Value};
use proxmox_router::{RpcEnvironment, RpcEnvironmentType};
use proxmox_sys::fs::{lock_dir_noblock_shared, replace_file, CreateOptions};
-use pbs_api_types::Authid;
+use pbs_api_types::{Authid, UploadStatistic};
use pbs_datastore::backup_info::{BackupDir, BackupInfo};
use pbs_datastore::dynamic_index::DynamicIndexWriter;
use pbs_datastore::fixed_index::FixedIndexWriter;
@@ -20,38 +19,6 @@ use crate::backup::verify_backup_dir_with_lock;
use hyper::{Body, Response};
-#[derive(Copy, Clone, Serialize)]
-struct UploadStatistic {
- count: u64,
- size: u64,
- compressed_size: u64,
- duplicates: u64,
-}
-
-impl UploadStatistic {
- fn new() -> Self {
- Self {
- count: 0,
- size: 0,
- compressed_size: 0,
- duplicates: 0,
- }
- }
-}
-
-impl std::ops::Add for UploadStatistic {
- type Output = Self;
-
- fn add(self, other: Self) -> Self {
- Self {
- count: self.count + other.count,
- size: self.size + other.size,
- compressed_size: self.compressed_size + other.compressed_size,
- duplicates: self.duplicates + other.duplicates,
- }
- }
-}
-
struct DynamicWriterState {
name: String,
index: DynamicIndexWriter,
--
2.30.2
next prev parent reply other threads:[~2023-08-01 9:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 9:29 [pbs-devel] [RFC PATCH proxmox-backup 0/3] show upload statistics in gui Dominik Csapak
2023-08-01 9:29 ` Dominik Csapak [this message]
2023-11-27 9:52 ` [pbs-devel] [RFC PATCH proxmox-backup 1/3] api-types: make UploadStatistic an api type Thomas Lamprecht
2023-11-27 10:01 ` Dominik Csapak
2023-11-27 10:12 ` Thomas Lamprecht
2023-11-27 10:17 ` Dominik Csapak
2023-11-27 12:44 ` Wolfgang Bumiller
2023-11-27 14:57 ` Dominik Csapak
2023-08-01 9:29 ` [pbs-devel] [RFC PATCH proxmox-backup 2/3] api: datastore: add upload_statistic to snapshot listing Dominik Csapak
2023-11-27 9:08 ` Wolfgang Bumiller
2023-08-01 9:29 ` [pbs-devel] [PATCH proxmox-backup 3/3] ui: datastore content: add action to show upload statistics Dominik Csapak
2023-11-27 9:28 ` Thomas Lamprecht
2023-11-27 10:04 ` Dominik Csapak
2023-11-27 10:27 ` Thomas Lamprecht
2023-11-27 10:33 ` Dominik Csapak
2023-11-27 12:02 ` Thomas Lamprecht
2023-11-27 12:08 ` Dominik Csapak
2023-11-27 10:07 ` Thomas Lamprecht
2023-11-27 10:15 ` Dominik Csapak
2023-11-27 12:06 ` 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=20230801092954.1686860-2-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