Re: [pbs-devel] [PATCH proxmox-backup 4/8] api2/pull: add do_syn_job helper

[Dietmar Maurer <dietmar@proxmox.com>]

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 <d.csapak@proxmox.com> wrote:
> 
>  
> this helper is inspired by our code in proxmox-backup-proxy
> with an added JobState writing
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  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<String>,
> +) -> Result<String, Error> {
> +
> +    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