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 225C668D5C for ; Mon, 3 Aug 2020 09:42:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 18B1D2B2C2 for ; Mon, 3 Aug 2020 09:42:40 +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 2C7C42B2B5 for ; Mon, 3 Aug 2020 09:42:39 +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 EA6F4430A8 for ; Mon, 3 Aug 2020 09:42:38 +0200 (CEST) Date: Mon, 3 Aug 2020 09:42:32 +0200 (CEST) From: Dietmar Maurer To: Proxmox Backup Server development discussion , Dominik Csapak Message-ID: <898737988.49.1596440553389@webmail.proxmox.com> In-Reply-To: <20200731124330.30576-5-d.csapak@proxmox.com> References: <20200731124330.30576-1-d.csapak@proxmox.com> <20200731124330.30576-5-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.3-Rev19 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.110 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-backup 4/8] api2/pull: add do_syn_job helper 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: Mon, 03 Aug 2020 07:42:40 -0000 Please can we first have a patch to split out do_syn_job from src/api2/admin/sync.rs? > On 07/31/2020 2:43 PM Dominik Csapak wrote: > > > this helper is inspired by our code in proxmox-backup-proxy > with an added JobState writing > > Signed-off-by: Dominik Csapak > --- > src/api2/pull.rs | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 70 insertions(+) > > diff --git a/src/api2/pull.rs b/src/api2/pull.rs > index cf7de524..e788d20f 100644 > --- a/src/api2/pull.rs > +++ b/src/api2/pull.rs > @@ -12,6 +12,8 @@ use crate::client::{HttpClient, HttpClientOptions, BackupRepository, pull::pull_ > use crate::api2::types::*; > use crate::config::{ > remote, > + sync::SyncJobConfig, > + jobstate::JobState, > acl::{PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_PRUNE, PRIV_REMOTE_READ}, > cached_user_info::CachedUserInfo, > }; > @@ -62,6 +64,74 @@ pub async fn get_pull_parameters( > Ok((client, src_repo, tgt_store)) > } > > +pub fn do_sync_job( > + id: &str, > + sync_job: SyncJobConfig, > + userid: &str, > + schedule: Option, > +) -> Result { > + > + let job_id = id.to_string(); > + let job_id2 = id.to_string(); > + let worker_type = "syncjob"; > + let upid_str = WorkerTask::spawn( > + worker_type, > + Some(id.to_string()), > + &userid.clone(), > + false, > + move |worker| async move { > + > + let mut state = JobState::new(&worker.upid().to_string()); > + match state.write_state(worker_type, &job_id2, None) { > + Ok(_) => {}, > + Err(err) => { > + eprintln!("could not write job state on start: {}", err); > + } > + } > + > + let worker2 = worker.clone(); > + > + let res = 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!("Starting datastore sync job '{}'", job_id)); > + if let Some(event_str) = schedule { > + worker.log(format!("task triggered by schedule '{}'", event_str)); > + } > + worker.log(format!("Sync datastore '{}' from '{}/{}'", > + sync_job.store, sync_job.remote, sync_job.remote_store)); > + > + crate::client::pull::pull_store(&worker, &client, &src_repo, tgt_store.clone(), delete, String::from("backup@pam")).await?; > + > + worker.log(format!("sync job '{}' end", &job_id)); > + > + Ok(()) > + }.await; > + > + let status = worker2.get_log_text(&res); > + > + match state.finish(&status) { > + Ok(_) => {}, > + Err(err) => { > + eprintln!("could not finish job state: {}", err); > + } > + } > + > + match state.write_state(&worker_type, &job_id2, None) { > + Ok(_) => {}, > + Err(err) => { > + eprintln!("could not write job state on finish: {}", err); > + } > + } > + > + res > + })?; > + > + Ok(upid_str) > +} > + > #[api( > input: { > properties: { > -- > 2.20.1 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel