From f1694b062da3276c484a9823273798a883e9bf4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 30 Oct 2020 12:36:41 +0100 Subject: [PATCH] fix #2864: add owner option to sync MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit instead of hard-coding 'backup@pam'. this allows a bit more flexibility (e.g., syncing to a datastore that can directly be used as restore source) without overly complicating things. Signed-off-by: Fabian Grünbichler --- src/api2/config/sync.rs | 16 ++++++++++++++-- src/api2/pull.rs | 5 ++--- src/config/sync.rs | 12 ++++++++++++ www/config/SyncView.js | 14 +++++++++++++- www/window/SyncJobEdit.js | 20 ++++++++++++++++++++ 5 files changed, 61 insertions(+), 6 deletions(-) diff --git a/src/api2/config/sync.rs b/src/api2/config/sync.rs index e5baa7da..758b4a02 100644 --- a/src/api2/config/sync.rs +++ b/src/api2/config/sync.rs @@ -45,6 +45,10 @@ pub fn list_sync_jobs( store: { schema: DATASTORE_SCHEMA, }, + owner: { + type: Authid, + optional: true, + }, remote: { schema: REMOTE_ID_SCHEMA, }, @@ -120,6 +124,8 @@ pub fn read_sync_job( #[allow(non_camel_case_types)] /// Deletable property name pub enum DeletableProperty { + /// Delete the owner property. + owner, /// Delete the comment property. comment, /// Delete the job schedule. @@ -139,6 +145,10 @@ pub enum DeletableProperty { schema: DATASTORE_SCHEMA, optional: true, }, + owner: { + type: Authid, + optional: true, + }, remote: { schema: REMOTE_ID_SCHEMA, optional: true, @@ -178,6 +188,7 @@ pub enum DeletableProperty { pub fn update_sync_job( id: String, store: Option, + owner: Option, remote: Option, remote_store: Option, remove_vanished: Option, @@ -202,6 +213,7 @@ pub fn update_sync_job( if let Some(delete) = delete { for delete_prop in delete { match delete_prop { + DeletableProperty::owner => { data.owner = None; }, DeletableProperty::comment => { data.comment = None; }, DeletableProperty::schedule => { data.schedule = None; }, DeletableProperty::remove_vanished => { data.remove_vanished = None; }, @@ -221,8 +233,8 @@ pub fn update_sync_job( if let Some(store) = store { data.store = store; } if let Some(remote) = remote { data.remote = remote; } if let Some(remote_store) = remote_store { data.remote_store = remote_store; } - - + if let Some(owner) = owner { data.owner = owner; } + if schedule.is_some() { data.schedule = schedule; } if remove_vanished.is_some() { data.remove_vanished = remove_vanished; } diff --git a/src/api2/pull.rs b/src/api2/pull.rs index 45c0b1b1..8491ab00 100644 --- a/src/api2/pull.rs +++ b/src/api2/pull.rs @@ -92,6 +92,7 @@ pub fn do_sync_job( let worker_future = async move { let delete = sync_job.remove_vanished.unwrap_or(true); + let sync_owner = sync_job.owner.unwrap_or(Authid::backup_auth_id().clone()); let (client, src_repo, tgt_store) = get_pull_parameters(&sync_job.store, &sync_job.remote, &sync_job.remote_store).await?; worker.log(format!("Starting datastore sync job '{}'", job_id)); @@ -101,9 +102,7 @@ pub fn do_sync_job( worker.log(format!("Sync datastore '{}' from '{}/{}'", sync_job.store, sync_job.remote, sync_job.remote_store)); - let backup_auth_id = Authid::backup_auth_id(); - - crate::client::pull::pull_store(&worker, &client, &src_repo, tgt_store.clone(), delete, backup_auth_id.clone()).await?; + crate::client::pull::pull_store(&worker, &client, &src_repo, tgt_store.clone(), delete, sync_owner).await?; worker.log(format!("sync job '{}' end", &job_id)); diff --git a/src/config/sync.rs b/src/config/sync.rs index 92ccb6fe..d007570c 100644 --- a/src/config/sync.rs +++ b/src/config/sync.rs @@ -30,6 +30,10 @@ lazy_static! { store: { schema: DATASTORE_SCHEMA, }, + "owner": { + type: Authid, + optional: true, + }, remote: { schema: REMOTE_ID_SCHEMA, }, @@ -56,6 +60,8 @@ lazy_static! { pub struct SyncJobConfig { pub id: String, pub store: String, + #[serde(skip_serializing_if="Option::is_none")] + pub owner: Option, pub remote: String, pub remote_store: String, #[serde(skip_serializing_if="Option::is_none")] @@ -75,6 +81,10 @@ pub struct SyncJobConfig { store: { schema: DATASTORE_SCHEMA, }, + owner: { + type: Authid, + optional: true, + }, remote: { schema: REMOTE_ID_SCHEMA, }, @@ -121,6 +131,8 @@ pub struct SyncJobConfig { pub struct SyncJobStatus { pub id: String, pub store: String, + #[serde(skip_serializing_if="Option::is_none")] + pub owner: Option, pub remote: String, pub remote_store: String, #[serde(skip_serializing_if="Option::is_none")] diff --git a/www/config/SyncView.js b/www/config/SyncView.js index 4865dec5..20fc5e86 100644 --- a/www/config/SyncView.js +++ b/www/config/SyncView.js @@ -1,7 +1,7 @@ Ext.define('pbs-sync-jobs-status', { extend: 'Ext.data.Model', fields: [ - 'id', 'remote', 'remote-store', 'store', 'schedule', + 'id', 'owner', 'remote', 'remote-store', 'store', 'schedule', 'next-run', 'last-run-upid', 'last-run-state', 'last-run-endtime', { name: 'duration', @@ -151,6 +151,11 @@ Ext.define('PBS.config.SyncJobView', { return Proxmox.Utils.render_timestamp(value); }, + render_optional_owner: function(value, metadata, record) { + if (!value) return '-'; + return Ext.String.htmlEncode(value, metadata, record); + }, + startStore: function() { this.getView().getStore().rstore.startUpdate(); }, stopStore: function() { this.getView().getStore().rstore.stopUpdate(); }, @@ -250,6 +255,13 @@ Ext.define('PBS.config.SyncJobView', { width: 120, sortable: true, }, + { + header: gettext('Owner'), + dataIndex: 'owner', + renderer: 'render_optional_owner', + flex: 2, + sortable: true, + }, { header: gettext('Schedule'), dataIndex: 'schedule', diff --git a/www/window/SyncJobEdit.js b/www/window/SyncJobEdit.js index 85dfb7d0..4edc8cc5 100644 --- a/www/window/SyncJobEdit.js +++ b/www/window/SyncJobEdit.js @@ -62,6 +62,26 @@ Ext.define('PBS.window.SyncJobEdit', { ], column2: [ + { + fieldLabel: gettext('Owner'), + xtype: 'pbsUserSelector', + name: 'owner', + allowBlank: true, + emptyText: 'backup@pam', + getSubmitData: function() { + let me = this; + let name = me.getName(); + let val = me.getSubmitValue(); + + let data = {}; + if (val === null || val === "") { + data.delete = name; + } else { + data[name] = val; + } + return data; + }, + }, { fieldLabel: gettext('Remove vanished'), xtype: 'proxmoxcheckbox',