From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 151326A0D7 for ; Tue, 11 Aug 2020 11:57:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B47621BCE5 for ; Tue, 11 Aug 2020 11:57:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D9A751BC6A for ; Tue, 11 Aug 2020 11:57:25 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9E32F445A0 for ; Tue, 11 Aug 2020 11:57:25 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 11 Aug 2020 11:57:18 +0200 Message-Id: <20200811095724.26896-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200811095724.26896-1-d.csapak@proxmox.com> References: <20200811095724.26896-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.046 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [sync.rs, pull.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 3/9] api/{pull, sync}: refactor to do_sync_job X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2020 09:57:31 -0000 and move the pull parameters into the worker, so that the task log contains the error if there is one Signed-off-by: Dominik Csapak --- new in v2 src/api2/admin/sync.rs | 27 ++++----------------------- src/api2/pull.rs | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs index 79af03bc..d3a79625 100644 --- a/src/api2/admin/sync.rs +++ b/src/api2/admin/sync.rs @@ -8,9 +8,9 @@ use proxmox::api::router::SubdirMap; use proxmox::{list_subdirs_api_method, sortable}; use crate::api2::types::*; -use crate::api2::pull::{get_pull_parameters}; +use crate::api2::pull::do_sync_job; use crate::config::sync::{self, SyncJobStatus, SyncJobConfig}; -use crate::server::{self, TaskListInfo, WorkerTask}; +use crate::server::{self, TaskListInfo}; use crate::tools::systemd::time::{ parse_calendar_event, compute_next_event}; @@ -84,7 +84,7 @@ pub fn list_sync_jobs( } )] /// Runs the sync jobs manually. -async fn run_sync_job( +fn run_sync_job( id: String, _info: &ApiMethod, rpcenv: &mut dyn RpcEnvironment, @@ -95,26 +95,7 @@ async fn run_sync_job( let userid: Userid = rpcenv.get_user().unwrap().parse()?; - let delete = sync_job.remove_vanished.unwrap_or(true); - let (client, src_repo, tgt_store) = get_pull_parameters(&sync_job.store, &sync_job.remote, &sync_job.remote_store).await?; - - let upid_str = WorkerTask::spawn("syncjob", Some(id.clone()), userid, false, move |worker| async move { - - worker.log(format!("sync job '{}' start", &id)); - - crate::client::pull::pull_store( - &worker, - &client, - &src_repo, - tgt_store.clone(), - delete, - Userid::backup_userid().clone(), - ).await?; - - worker.log(format!("sync job '{}' end", &id)); - - Ok(()) - })?; + let upid_str = do_sync_job(&id, sync_job, &userid)?; Ok(upid_str) } diff --git a/src/api2/pull.rs b/src/api2/pull.rs index b0db45c9..3265853b 100644 --- a/src/api2/pull.rs +++ b/src/api2/pull.rs @@ -12,6 +12,7 @@ use crate::client::{HttpClient, HttpClientOptions, BackupRepository, pull::pull_ use crate::api2::types::*; use crate::config::{ remote, + sync::SyncJobConfig, acl::{PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_PRUNE, PRIV_REMOTE_READ}, cached_user_info::CachedUserInfo, }; @@ -62,6 +63,37 @@ pub async fn get_pull_parameters( Ok((client, src_repo, tgt_store)) } +pub fn do_sync_job( + id: &str, + sync_job: SyncJobConfig, + userid: &Userid, +) -> Result { + + let job_id = id.to_string(); + + let upid_str = WorkerTask::spawn("syncjob", Some(id.to_string()), userid.clone(), false, move |worker| async move { + let delete = sync_job.remove_vanished.unwrap_or(true); + let (client, src_repo, tgt_store) = get_pull_parameters(&sync_job.store, &sync_job.remote, &sync_job.remote_store).await?; + + worker.log(format!("sync job '{}' start", &job_id)); + + crate::client::pull::pull_store( + &worker, + &client, + &src_repo, + tgt_store.clone(), + delete, + Userid::backup_userid().clone(), + ).await?; + + worker.log(format!("sync job '{}' end", &job_id)); + + Ok(()) + })?; + + Ok(upid_str) +} + #[api( input: { properties: { -- 2.20.1