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 62AE178152 for ; Thu, 29 Apr 2021 14:40:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 58F0E1C54F for ; Thu, 29 Apr 2021 14:40:41 +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 D02441C541 for ; Thu, 29 Apr 2021 14:40:40 +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 A3DD7464CB for ; Thu, 29 Apr 2021 14:40:40 +0200 (CEST) To: Proxmox Backup Server development discussion , Wolfgang Bumiller References: <20210422140213.30989-1-w.bumiller@proxmox.com> <20210422140213.30989-14-w.bumiller@proxmox.com> From: Dietmar Maurer Message-ID: <6e542767-3117-95f5-c1e8-d2a28427c08a@proxmox.com> Date: Thu, 29 Apr 2021 14:40:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210422140213.30989-14-w.bumiller@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 0.291 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH v2 backup 13/27] add node config 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: Thu, 29 Apr 2021 12:40:41 -0000 We use replace_file() to atomically replace the config file, so why do we need a read_lock()? A) We don't need it => remove it for your patch series B) We need it for some reason => We need to add that for other config files too? On 4/22/21 4:01 PM, Wolfgang Bumiller wrote: > + > +const CONF_FILE: &str = configdir!("/node.cfg"); > +const LOCK_FILE: &str = configdir!("/.node.cfg.lock"); > +const LOCK_TIMEOUT: Duration = Duration::from_secs(5); > + > +pub fn read_lock() -> Result { > + proxmox::tools::fs::open_file_locked(LOCK_FILE, LOCK_TIMEOUT, false) > +} > + > +pub fn write_lock() -> Result { > + proxmox::tools::fs::open_file_locked(LOCK_FILE, LOCK_TIMEOUT, true) > +} > + > +/// Read the Node Config. > +pub fn config() -> Result<(NodeConfig, [u8; 32]), Error> { > + let content = > + proxmox::tools::fs::file_read_optional_string(CONF_FILE)?.unwrap_or_else(|| "".to_string()); > + > + let digest = openssl::sha::sha256(content.as_bytes()); > + let data: NodeConfig = crate::tools::config::from_str(&content, &NodeConfig::API_SCHEMA)?; > + > + Ok((data, digest)) > +} > + > +/// Write the Node Config, requires the write lock to be held. > +pub fn save_config(config: &NodeConfig) -> Result<(), Error> { > + let raw = crate::tools::config::to_bytes(config, &NodeConfig::API_SCHEMA)?; > + > + let backup_user = crate::backup::backup_user()?; > + let options = CreateOptions::new() > + .perm(Mode::from_bits_truncate(0o0640)) > + .owner(nix::unistd::ROOT) > + .group(backup_user.gid); > + > + replace_file(CONF_FILE, &raw, options) > +} > +