[pbs-devel] [PATCH proxmox-backup 1/3] fix #3331: improve progress for last snapshot in group

[pbs-devel] [PATCH proxmox-backup 1/3] fix #3331: improve progress for last snapshot in group

[Fabian Grünbichler]

especially for the last group, without this the progress would report:

"percentage done: 100.00% (1 of 2 groups, 1 of 1 group snapshots)"

instead of the more logical

"percentage done: 100.00% (2 of 2 groups)"

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

Notes:
    note: alternatively, we could only do this special case for the very last
    group, and leave the other groups to display:
    
    "percentage done: 50.00% (1 of 4 groups, 1 of 1 group snapshots)"
    
    which looks a bit weird, but would mean that the format stays consistent over
    the whole log, instead of switching between groups+snapshots and just groups.
    
    see also next patches, which makes it a bit more informative/readable IMHO

 src/backup/store_progress.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/backup/store_progress.rs b/src/backup/store_progress.rs
index 83696f6d..115c14c2 100644
--- a/src/backup/store_progress.rs
+++ b/src/backup/store_progress.rs
@@ -33,6 +33,12 @@ impl StoreProgress {
 
 impl std::fmt::Display for StoreProgress {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let current_group = if self.done_groups < self.total_groups {
+            self.done_groups + 1
+        } else {
+            self.done_groups
+        };
+
         if self.group_snapshots == 0 {
             write!(
                 f,
@@ -49,6 +55,14 @@ impl std::fmt::Display for StoreProgress {
                 self.done_snapshots,
                 self.group_snapshots,
             )
+        } else if self.done_snapshots == self.group_snapshots {
+            write!(
+                f,
+                "{:.2}% ({} of {} groups)",
+                self.percentage() * 100.0,
+                current_group,
+                self.total_groups,
+            )
         } else {
             write!(
                 f,
-- 
2.20.1

[pbs-devel] [RFC proxmox-backup 2/3] progress: add current group to output

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/backup/store_progress.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backup/store_progress.rs b/src/backup/store_progress.rs
index 115c14c2..e355c9bf 100644
--- a/src/backup/store_progress.rs
+++ b/src/backup/store_progress.rs
@@ -66,12 +66,13 @@ impl std::fmt::Display for StoreProgress {
         } else {
             write!(
                 f,
-                "{:.2}% ({} of {} groups, {} of {} group snapshots)",
+                "{:.2}% ({} of {} groups, {} of {} group #{}'s snapshots)",
                 self.percentage() * 100.0,
                 self.done_groups,
                 self.total_groups,
                 self.done_snapshots,
                 self.group_snapshots,
+                current_group,
             )
         }
     }
-- 
2.20.1

[pbs-devel] applied: [RFC proxmox-backup 2/3] progress: add current group to output

[Dietmar Maurer]

applied

On 5/7/21 10:03 AM, Fabian Grünbichler wrote:
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>   src/backup/store_progress.rs | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/backup/store_progress.rs b/src/backup/store_progress.rs
> index 115c14c2..e355c9bf 100644
> --- a/src/backup/store_progress.rs
> +++ b/src/backup/store_progress.rs
> @@ -66,12 +66,13 @@ impl std::fmt::Display for StoreProgress {
>           } else {
>               write!(
>                   f,
> -                "{:.2}% ({} of {} groups, {} of {} group snapshots)",
> +                "{:.2}% ({} of {} groups, {} of {} group #{}'s snapshots)",
>                   self.percentage() * 100.0,
>                   self.done_groups,
>                   self.total_groups,
>                   self.done_snapshots,
>                   self.group_snapshots,
> +                current_group,
>               )
>           }
>       }

[pbs-devel] [RFC proxmox-backup 3/3] progress: shorter format

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

Notes:
    separate patch since it changes format more fundamentally, but can be squashed
    with previous patch if applied.

 src/backup/store_progress.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backup/store_progress.rs b/src/backup/store_progress.rs
index e355c9bf..754727fc 100644
--- a/src/backup/store_progress.rs
+++ b/src/backup/store_progress.rs
@@ -42,7 +42,7 @@ impl std::fmt::Display for StoreProgress {
         if self.group_snapshots == 0 {
             write!(
                 f,
-                "{:.2}% ({} of {} groups)",
+                "{:.2}% ({}/{} groups)",
                 self.percentage() * 100.0,
                 self.done_groups,
                 self.total_groups,
@@ -50,7 +50,7 @@ impl std::fmt::Display for StoreProgress {
         } else if self.total_groups == 1 {
             write!(
                 f,
-                "{:.2}% ({} of {} snapshots)",
+                "{:.2}% ({}/{} snapshots)",
                 self.percentage() * 100.0,
                 self.done_snapshots,
                 self.group_snapshots,
@@ -58,7 +58,7 @@ impl std::fmt::Display for StoreProgress {
         } else if self.done_snapshots == self.group_snapshots {
             write!(
                 f,
-                "{:.2}% ({} of {} groups)",
+                "{:.2}% ({}/{} groups)",
                 self.percentage() * 100.0,
                 current_group,
                 self.total_groups,
@@ -66,7 +66,7 @@ impl std::fmt::Display for StoreProgress {
         } else {
             write!(
                 f,
-                "{:.2}% ({} of {} groups, {} of {} group #{}'s snapshots)",
+                "{:.2}% ({}/{} groups, {}/{} snapshots in group #{})",
                 self.percentage() * 100.0,
                 self.done_groups,
                 self.total_groups,
-- 
2.20.1

[pbs-devel] applied: [RFC proxmox-backup 3/3] progress: shorter format

[Dietmar Maurer]

applied

On 5/7/21 10:03 AM, Fabian Grünbichler wrote:
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>
> Notes:
>      separate patch since it changes format more fundamentally, but can be squashed
>      with previous patch if applied.
>
>   src/backup/store_progress.rs | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/backup/store_progress.rs b/src/backup/store_progress.rs
> index e355c9bf..754727fc 100644
> --- a/src/backup/store_progress.rs
> +++ b/src/backup/store_progress.rs
> @@ -42,7 +42,7 @@ impl std::fmt::Display for StoreProgress {
>           if self.group_snapshots == 0 {
>               write!(
>                   f,
> -                "{:.2}% ({} of {} groups)",
> +                "{:.2}% ({}/{} groups)",
>                   self.percentage() * 100.0,
>                   self.done_groups,
>                   self.total_groups,
> @@ -50,7 +50,7 @@ impl std::fmt::Display for StoreProgress {
>           } else if self.total_groups == 1 {
>               write!(
>                   f,
> -                "{:.2}% ({} of {} snapshots)",
> +                "{:.2}% ({}/{} snapshots)",
>                   self.percentage() * 100.0,
>                   self.done_snapshots,
>                   self.group_snapshots,
> @@ -58,7 +58,7 @@ impl std::fmt::Display for StoreProgress {
>           } else if self.done_snapshots == self.group_snapshots {
>               write!(
>                   f,
> -                "{:.2}% ({} of {} groups)",
> +                "{:.2}% ({}/{} groups)",
>                   self.percentage() * 100.0,
>                   current_group,
>                   self.total_groups,
> @@ -66,7 +66,7 @@ impl std::fmt::Display for StoreProgress {
>           } else {
>               write!(
>                   f,
> -                "{:.2}% ({} of {} groups, {} of {} group #{}'s snapshots)",
> +                "{:.2}% ({}/{} groups, {}/{} snapshots in group #{})",
>                   self.percentage() * 100.0,
>                   self.done_groups,
>                   self.total_groups,

[pbs-devel] applied: [PATCH proxmox-backup 1/3] fix #3331: improve progress for last snapshot in group

[Dietmar Maurer]

applied

On 5/7/21 10:03 AM, Fabian Grünbichler wrote:
> especially for the last group, without this the progress would report:
>
> "percentage done: 100.00% (1 of 2 groups, 1 of 1 group snapshots)"
>
> instead of the more logical
>
> "percentage done: 100.00% (2 of 2 groups)"
>
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>
> Notes:
>      note: alternatively, we could only do this special case for the very last
>      group, and leave the other groups to display:
>      
>      "percentage done: 50.00% (1 of 4 groups, 1 of 1 group snapshots)"
>      
>      which looks a bit weird, but would mean that the format stays consistent over
>      the whole log, instead of switching between groups+snapshots and just groups.
>      
>      see also next patches, which makes it a bit more informative/readable IMHO
>
>   src/backup/store_progress.rs | 14 ++++++++++++++
>   1 file changed, 14 insertions(+)
>
> diff --git a/src/backup/store_progress.rs b/src/backup/store_progress.rs
> index 83696f6d..115c14c2 100644
> --- a/src/backup/store_progress.rs
> +++ b/src/backup/store_progress.rs
> @@ -33,6 +33,12 @@ impl StoreProgress {
>   
>   impl std::fmt::Display for StoreProgress {
>       fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
> +        let current_group = if self.done_groups < self.total_groups {
> +            self.done_groups + 1
> +        } else {
> +            self.done_groups
> +        };
> +
>           if self.group_snapshots == 0 {
>               write!(
>                   f,
> @@ -49,6 +55,14 @@ impl std::fmt::Display for StoreProgress {
>                   self.done_snapshots,
>                   self.group_snapshots,
>               )
> +        } else if self.done_snapshots == self.group_snapshots {
> +            write!(
> +                f,
> +                "{:.2}% ({} of {} groups)",
> +                self.percentage() * 100.0,
> +                current_group,
> +                self.total_groups,
> +            )
>           } else {
>               write!(
>                   f,