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 E42AC767ED for ; Fri, 16 Jul 2021 10:53:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E2490E1F2 for ; Fri, 16 Jul 2021 10:53:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 9DD3FE1A4 for ; Fri, 16 Jul 2021 10:53:29 +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 71ADF42150 for ; Fri, 16 Jul 2021 10:53:29 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 16 Jul 2021 10:53:24 +0200 Message-Id: <20210716085328.3731574-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210716085328.3731574-1-d.csapak@proxmox.com> References: <20210716085328.3731574-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.587 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 07/11] server/prune_job: add 'keep_all' logic to 'prune_datastore' 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: Fri, 16 Jul 2021 08:53:31 -0000 it is the same as when pruning single groups. for prune_jobs, we never start the worker if there is no prune option set. but if we want to call 'prune_datastore' from somewhere else, we have to check it here again Signed-off-by: Dominik Csapak --- src/server/prune_job.rs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/server/prune_job.rs b/src/server/prune_job.rs index 7ea42fcb..40ed555f 100644 --- a/src/server/prune_job.rs +++ b/src/server/prune_job.rs @@ -19,11 +19,17 @@ pub fn prune_datastore( ) -> Result<(), Error> { task_log!(worker, "Starting datastore prune on store \"{}\"", store); - task_log!( - worker, - "retention options: {}", - prune_options.cli_options_string() - ); + let keep_all = !prune_options.keeps_something(); + + if keep_all { + task_log!(worker, "No prune selection - keeping all files."); + } else { + task_log!( + worker, + "retention options: {}", + prune_options.cli_options_string() + ); + } let base_path = datastore.base_path(); @@ -41,7 +47,8 @@ pub fn prune_datastore( group.backup_id() ); - for (info, keep) in prune_info { + for (info, mut keep) in prune_info { + if keep_all { keep = true; } task_log!( worker, "{} {}/{}/{}", -- 2.30.2