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 7C16C6A151 for ; Tue, 11 Aug 2020 11:58:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E346F1BD01 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 F144A1BC6F 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 B59A3445A5 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:19 +0200 Message-Id: <20200811095724.26896-5-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.045 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 4/9] api2/pull: extend do_sync_job to also handle schedule and jobstate 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:58:01 -0000 so that we can log if triggered by a schedule, and writing to a jobstatefile Signed-off-by: Dominik Csapak --- changes from v1: * extend the previous patch src/api2/admin/sync.rs | 2 +- src/api2/pull.rs | 78 +++++++++++++++++++++++++++++++----------- 2 files changed, 59 insertions(+), 21 deletions(-) diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs index d3a79625..19baaa0f 100644 --- a/src/api2/admin/sync.rs +++ b/src/api2/admin/sync.rs @@ -95,7 +95,7 @@ fn run_sync_job( let userid: Userid = rpcenv.get_user().unwrap().parse()?; - let upid_str = do_sync_job(&id, sync_job, &userid)?; + let upid_str = do_sync_job(&id, sync_job, &userid, None)?; Ok(upid_str) } diff --git a/src/api2/pull.rs b/src/api2/pull.rs index 3265853b..38bd065d 100644 --- a/src/api2/pull.rs +++ b/src/api2/pull.rs @@ -13,6 +13,7 @@ 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, }; @@ -67,29 +68,66 @@ pub fn do_sync_job( id: &str, sync_job: SyncJobConfig, userid: &Userid, + schedule: Option, ) -> 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(()) - })?; + 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, Userid::backup_userid().clone()).await?; + + worker.log(format!("sync job '{}' end", &job_id)); + + Ok(()) + }.await; + + let status = worker2.create_state(&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) } -- 2.20.1