From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 122EF1FF163 for ; Thu, 21 Nov 2024 15:54:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3F7F748F; Thu, 21 Nov 2024 15:54:58 +0100 (CET) Date: Thu, 21 Nov 2024 15:54:22 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20241113150102.164820-1-h.laimer@proxmox.com> <20241113150102.164820-24-h.laimer@proxmox.com> In-Reply-To: <20241113150102.164820-24-h.laimer@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1732200691.cybyurdruo.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.048 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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. [directory.rs, proxmox.com] Subject: Re: [pbs-devel] [PATCH proxmox-backup v13 23/26] api: node: include removable datastores in directory list 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On November 13, 2024 4:00 pm, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > src/api2/node/disks/directory.rs | 29 ++++++++++++++++++++++++++++- > 1 file changed, 28 insertions(+), 1 deletion(-) > > diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs > index 7e020e27..21d2bcc4 100644 > --- a/src/api2/node/disks/directory.rs > +++ b/src/api2/node/disks/directory.rs > @@ -45,6 +45,8 @@ pub struct DatastoreMountInfo { > pub path: String, > /// The mounted device. > pub device: String, > + /// This is removable > + pub removable: bool, > /// File system type > pub filesystem: Option, > /// Mount options > @@ -61,7 +63,7 @@ pub struct DatastoreMountInfo { > } > }, > returns: { > - description: "List of systemd datastore mount units.", > + description: "List of removable-datastore devices and systemd datastore mount units.", > type: Array, > items: { > type: DatastoreMountInfo, > @@ -100,6 +102,31 @@ pub fn list_datastore_mounts() -> Result, Error> { > path: data.Where, > filesystem: data.Type, > options: data.Options, > + removable: false, > + }); > + } > + > + let (config, _digest) = pbs_config::datastore::config()?; > + let store_list: Vec = config.convert_to_typed_array("datastore")?; > + > + for item in store_list > + .into_iter() > + .filter(|store| store.backing_device.is_some()) > + { > + let Some(backing_device) = item.backing_device.as_deref() else { > + continue; > + }; > + let Some(mount_point) = item.get_mount_point() else { > + continue; > + }; this is redundant, get_mount_point will only return Some if there's a backing_device.. in fact, I think we can remove the get_mount_point fn entirely, and always check for backing_device (absolute_path will then return the mountpoint..) there's only a few places (beside this) where we only look at get_mount_point, and those can easily be adapted to make backing_device() *the* single way to check if a datastore is a removable one, which makes reasoning a lot easier.. > + list.push(DatastoreMountInfo { > + unitfile: "datastore config".to_string(), > + name: item.name.clone(), > + device: format!("/dev/disk/by-uuid/{backing_device}"), > + path: mount_point, > + filesystem: None, > + options: None, > + removable: true, > }); > } > > -- > 2.39.5 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel