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 37D4A6CD4B for ; Wed, 31 Mar 2021 11:44:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2B644D20B for ; Wed, 31 Mar 2021 11:44:21 +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 54815D1E1 for ; Wed, 31 Mar 2021 11:44:19 +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 1E11145882 for ; Wed, 31 Mar 2021 11:44:19 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 31 Mar 2021 11:44:15 +0200 Message-Id: <20210331094418.16609-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210331094418.16609-1-d.csapak@proxmox.com> References: <20210331094418.16609-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.176 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox-backup-api.rs, worker-task-abort.rs, buildcfg.rs] Subject: [pbs-devel] [PATCH proxmox-backup 3/6] add a CACHE_DIR to the created directories on daemon startup 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: Wed, 31 Mar 2021 09:44:51 -0000 we can use this for having a semi-persistent file cache Signed-off-by: Dominik Csapak --- src/bin/proxmox-backup-api.rs | 2 +- src/buildcfg.rs | 6 ++++++ src/server/worker_task.rs | 9 +++++---- tests/worker-task-abort.rs | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/bin/proxmox-backup-api.rs b/src/bin/proxmox-backup-api.rs index 7d800259..6e813414 100644 --- a/src/bin/proxmox-backup-api.rs +++ b/src/bin/proxmox-backup-api.rs @@ -30,7 +30,7 @@ async fn run() -> Result<(), Error> { bail!("unable to inititialize syslog - {}", err); } - server::create_task_log_dirs()?; + server::create_dirs()?; config::create_configdir()?; diff --git a/src/buildcfg.rs b/src/buildcfg.rs index 4f333288..40625fad 100644 --- a/src/buildcfg.rs +++ b/src/buildcfg.rs @@ -7,12 +7,18 @@ pub const JS_DIR: &str = "/usr/share/javascript/proxmox-backup"; #[macro_export] macro_rules! PROXMOX_BACKUP_RUN_DIR_M { () => ("/run/proxmox-backup") } +#[macro_export] +macro_rules! PROXMOX_BACKUP_CACHE_DIR_M { () => ("/var/cache/proxmox-backup") } + #[macro_export] macro_rules! PROXMOX_BACKUP_LOG_DIR_M { () => ("/var/log/proxmox-backup") } /// namespaced directory for in-memory (tmpfs) run state pub const PROXMOX_BACKUP_RUN_DIR: &str = PROXMOX_BACKUP_RUN_DIR_M!(); +/// namespaced directory for on-disk file caches +pub const PROXMOX_BACKUP_CACHE_DIR: &str = PROXMOX_BACKUP_CACHE_DIR_M!(); + /// namespaced directory for persistent logging pub const PROXMOX_BACKUP_LOG_DIR: &str = PROXMOX_BACKUP_LOG_DIR_M!(); diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs index 6c5456c9..8e072526 100644 --- a/src/server/worker_task.rs +++ b/src/server/worker_task.rs @@ -153,8 +153,8 @@ fn parse_worker_status_line(line: &str) -> Result<(String, UPID, Option Result<(), Error> { +/// Create necessary directories with correct permissions +pub fn create_dirs() -> Result<(), Error> { try_block!({ let backup_user = crate::backup::backup_user()?; @@ -164,9 +164,10 @@ pub fn create_task_log_dirs() -> Result<(), Error> { create_path(buildcfg::PROXMOX_BACKUP_LOG_DIR, None, Some(opts.clone()))?; create_path(PROXMOX_BACKUP_TASK_DIR, None, Some(opts.clone()))?; - create_path(buildcfg::PROXMOX_BACKUP_RUN_DIR, None, Some(opts))?; + create_path(buildcfg::PROXMOX_BACKUP_RUN_DIR, None, Some(opts.clone()))?; + create_path(buildcfg::PROXMOX_BACKUP_CACHE_DIR, None, Some(opts))?; Ok(()) - }).map_err(|err: Error| format_err!("unable to create task log dir - {}", err))?; + }).map_err(|err: Error| format_err!("unable to create dirs - {}", err))?; Ok(()) } diff --git a/tests/worker-task-abort.rs b/tests/worker-task-abort.rs index 1a0d938d..a68ab1aa 100644 --- a/tests/worker-task-abort.rs +++ b/tests/worker-task-abort.rs @@ -32,7 +32,7 @@ fn garbage_collection(worker: &server::WorkerTask) -> Result<(), Error> { #[test] #[ignore] fn worker_task_abort() -> Result<(), Error> { - server::create_task_log_dirs()?; + server::create_dirs()?; use std::sync::{Arc, Mutex}; -- 2.20.1