[pbs-devel] [PATCH proxmox-backup 1/3] verify: allow '0' days for reverification

[pbs-devel] [PATCH proxmox-backup 1/3] verify: allow '0' days for reverification

[Dominik Csapak]

and let it mean that we will always reverify

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 pbs-api-types/src/jobs.rs | 4 ++--
 src/backup/verify.rs      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbs-api-types/src/jobs.rs b/pbs-api-types/src/jobs.rs
index c6664104..0e83da73 100644
--- a/pbs-api-types/src/jobs.rs
+++ b/pbs-api-types/src/jobs.rs
@@ -145,8 +145,8 @@ pub const IGNORE_VERIFIED_BACKUPS_SCHEMA: Schema = BooleanSchema::new(
     .schema();
 
 pub const VERIFICATION_OUTDATED_AFTER_SCHEMA: Schema = IntegerSchema::new(
-    "Days after that a verification becomes outdated")
-    .minimum(1)
+    "Days after that a verification becomes outdated. (0 means always)")
+    .minimum(0)
     .schema();
 
 #[api(
diff --git a/src/backup/verify.rs b/src/backup/verify.rs
index e37c63be..e835d625 100644
--- a/src/backup/verify.rs
+++ b/src/backup/verify.rs
@@ -560,7 +560,7 @@ pub fn verify_filter(
                     let now = proxmox_time::epoch_i64();
                     let days_since_last_verify = (now - last_verify.upid.starttime) / 86400;
 
-                    days_since_last_verify > max_age
+                    max_age == 0 || days_since_last_verify > max_age
                 }
             }
         }
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 2/3] ui: datastore/Content: improve verification actions

[Dominik Csapak]

verifying a single snapshot is now never skipped because of recent verify
verifying a group will now reverify after 29 days to be consistent
with the 'All OK (old)' display

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/datastore/Content.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/datastore/Content.js b/www/datastore/Content.js
index 5aaec85c..d0498bc7 100644
--- a/www/datastore/Content.js
+++ b/www/datastore/Content.js
@@ -388,11 +388,13 @@ Ext.define('PBS.DataStoreContent', {
 		    "backup-type": data["backup-type"],
 		    "backup-id": data["backup-id"],
 		    "backup-time": (data['backup-time'].getTime()/1000).toFixed(0),
+		    "outdated-after": 0, // always reverify single snapshots
 		};
 	    } else {
 		params = {
 		    "backup-type": data.backup_type,
 		    "backup-id": data.backup_id,
+		    "outdated-after": 29, // reverify after 29 days so match with the "old" display
 		};
 	    }
 
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 3/3] ui: datastore/Content: add 'Re-Verify after (days)' input to 'Verify All'

[Dominik Csapak]

so that a user can select when snapshots should be re-verified

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/datastore/Content.js | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/www/datastore/Content.js b/www/datastore/Content.js
index d0498bc7..c04bf32a 100644
--- a/www/datastore/Content.js
+++ b/www/datastore/Content.js
@@ -329,17 +329,32 @@ Ext.define('PBS.DataStoreContent', {
 	verifyAll: function() {
 	    var view = this.getView();
 
-	    Proxmox.Utils.API2Request({
-		url: `/admin/datastore/${view.datastore}/verify`,
+	    Ext.create('Proxmox.window.Edit', {
+		title: Ext.String.format(gettext("Verify '{0}'"), view.datastore),
+
 		method: 'POST',
-		failure: function(response) {
-		    Ext.Msg.alert(gettext('Error'), response.htmlStatus);
-		},
-		success: function(response, options) {
-		    Ext.create('Proxmox.window.TaskViewer', {
-			upid: response.result.data,
-		    }).show();
-		},
+		submitText: gettext('OK'),
+		autoShow: true,
+		isCreate: true,
+		showTaskViewer: true,
+
+		taskDone: () => this.reload(),
+
+		url: `/api2/extjs/admin/datastore/${view.datastore}/verify`,
+
+		items: [
+		    {
+			xtype: 'proxmoxintegerfield',
+			name: 'outdated-after',
+			fieldLabel: gettext('Re-Verify After (days)'),
+			labelWidth: 150,
+			minValue: 1,
+			value: 30,
+			allowBlank: true,
+			emptyText: gettext('Never'),
+			deleteEmpty: false,
+		    },
+		],
 	    });
 	},
 
@@ -1004,7 +1019,6 @@ Ext.define('PBS.DataStoreContent', {
 	{
 	    xtype: 'proxmoxButton',
 	    text: gettext('Verify All'),
-	    confirmMsg: gettext('Do you want to verify all snapshots now?'),
 	    handler: 'verifyAll',
 	},
 	{
-- 
2.30.2

[pbs-devel] applied: [PATCH proxmox-backup 1/3] verify: allow '0' days for reverification

[Thomas Lamprecht]

On 27.01.22 15:13, Dominik Csapak wrote:
> and let it mean that we will always reverify
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  pbs-api-types/src/jobs.rs | 4 ++--
>  src/backup/verify.rs      | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
>

applied, thanks!

[pbs-devel] applied: [PATCH proxmox-backup 2/3] ui: datastore/Content: improve verification actions

[Thomas Lamprecht]

On 27.01.22 15:13, Dominik Csapak wrote:
> verifying a single snapshot is now never skipped because of recent verify
> verifying a group will now reverify after 29 days to be consistent
> with the 'All OK (old)' display
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  www/datastore/Content.js | 2 ++
>  1 file changed, 2 insertions(+)
> 
>

applied, thanks!