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 86B26650B6 for ; Mon, 2 Nov 2020 12:34:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5B8D5228A3 for ; Mon, 2 Nov 2020 12:34:42 +0100 (CET) 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 9AADC22886 for ; Mon, 2 Nov 2020 12:34:40 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6016545FED for ; Mon, 2 Nov 2020 12:34:40 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 2 Nov 2020 12:34:38 +0100 Message-Id: <20201102113439.26618-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201102113439.26618-1-d.csapak@proxmox.com> References: <20201102113439.26618-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.424 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: [pbs-devel] [PATCH proxmox-backup 4/5] api2/admin/datastore: start the garbage_collection task with our 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, 02 Nov 2020 11:34:42 -0000 instead of manually, this has the advantage that we now set the jobstate correctly and can return with an error if it is currently running (instead of failing in the task) Signed-off-by: Dominik Csapak --- src/api2/admin/datastore.rs | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 220f06ae..a5d3e979 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -29,7 +29,7 @@ use crate::backup::*; use crate::config::datastore; use crate::config::cached_user_info::CachedUserInfo; -use crate::server::WorkerTask; +use crate::server::{jobstate::Job, WorkerTask}; use crate::tools::{ self, zip::{ZipEncoder, ZipEntry}, @@ -856,20 +856,13 @@ fn start_garbage_collection( let datastore = DataStore::lookup_datastore(&store)?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; - println!("Starting garbage collection on store {}", store); + let job = Job::new("garbage_collection", &store) + .map_err(|_| format_err!("garbage collection already running"))?; let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; - let upid_str = WorkerTask::new_thread( - "garbage_collection", - Some(store.clone()), - auth_id.clone(), - to_stdout, - move |worker| { - worker.log(format!("starting garbage collection on store {}", store)); - datastore.garbage_collection(&*worker, worker.upid()) - }, - )?; + let upid_str = crate::server::do_garbage_collection_job(job, datastore, &auth_id, None, to_stdout) + .map_err(|err| format_err!("unable to start garbage collection job on datastore {} - {}", store, err))?; Ok(json!(upid_str)) } -- 2.20.1