From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 60F0920EC88 for ; Wed, 24 Apr 2024 15:14:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0114CCECA; Wed, 24 Apr 2024 15:14:14 +0200 (CEST) Date: Wed, 24 Apr 2024 15:13:37 +0200 From: Wolfgang Bumiller To: Hannes Laimer Message-ID: References: <20240423083000.28002-1-h.laimer@proxmox.com> <20240423083000.28002-11-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240423083000.28002-11-h.laimer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -1.215 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 ENA_SUBJ_ODD_CASE 2.6 Subject has odd case 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [status.rs, datastore.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup v9 10/26] pbs-api-types: add removable/is-available flag to DataStoreListItem 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 Cc: pbs-devel@lists.proxmox.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On Tue, Apr 23, 2024 at 10:29:44AM +0200, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > pbs-api-types/src/datastore.rs | 9 ++++++++- > src/api2/admin/datastore.rs | 17 +++++++++-------- > src/api2/status.rs | 18 +++++++++++++++--- > 3 files changed, 32 insertions(+), 12 deletions(-) > > diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs > index 9a71ce53..12a5d397 100644 > --- a/pbs-api-types/src/datastore.rs > +++ b/pbs-api-types/src/datastore.rs > @@ -432,6 +432,10 @@ impl DataStoreConfig { > pub struct DataStoreListItem { > pub store: String, > pub comment: Option, > + /// Datastore is removable > + pub removable: bool, > + /// Datastore is available > + pub available: bool, > /// If the datastore is in maintenance mode, information about it > #[serde(skip_serializing_if = "Option::is_none")] > pub maintenance: Option, > @@ -1399,6 +1403,8 @@ pub struct DataStoreStatusListItem { > /// The available bytes of the underlying storage. (-1 on error) > #[serde(skip_serializing_if = "Option::is_none")] > pub avail: Option, > + /// The datastore is available, relevant if removable > + pub is_available: bool, > /// A list of usages of the past (last Month). > #[serde(skip_serializing_if = "Option::is_none")] > pub history: Option>>, > @@ -1423,12 +1429,13 @@ pub struct DataStoreStatusListItem { > } > > impl DataStoreStatusListItem { > - pub fn empty(store: &str, err: Option) -> Self { > + pub fn empty(store: &str, err: Option, is_available: bool) -> Self { > DataStoreStatusListItem { > store: store.to_owned(), > total: None, > used: None, > avail: None, > + is_available, > history: None, > history_start: None, > history_delta: None, > diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs > index fd26f0db..57563028 100644 > --- a/src/api2/admin/datastore.rs > +++ b/src/api2/admin/datastore.rs > @@ -1262,8 +1262,8 @@ pub fn get_datastore_list( > > let mut list = Vec::new(); > > - for (store, (_, data)) in &config.sections { > - let acl_path = &["datastore", store]; > + for (store, (_, data)) in config.sections { > + let acl_path = &["datastore", &store]; > let user_privs = user_info.lookup_privs(&auth_id, acl_path); > let allowed = (user_privs & (PRIV_DATASTORE_AUDIT | PRIV_DATASTORE_BACKUP)) != 0; > > @@ -1274,15 +1274,16 @@ pub fn get_datastore_list( > } > } > > + let store_config: DataStoreConfig = serde_json::from_value(data)?; > + let is_available = pbs_datastore::is_datastore_available(&store_config); ^ is_datastore_available is called in a loop here, so it might make sense to have a variant that gets a cached `MountInfo`. > + > if allowed || allow_id { > list.push(DataStoreListItem { > store: store.clone(), > - comment: if !allowed { > - None > - } else { > - data["comment"].as_str().map(String::from) > - }, > - maintenance: data["maintenance-mode"].as_str().map(String::from), > + comment: if !allowed { None } else { store_config.comment }, ^ since you're already modifying it - could be condensed to: comment: store_config.comment.filter(|_| allowed), (but not important) > + removable: store_config.backing_device.is_some(), > + available: is_available, > + maintenance: store_config.maintenance_mode, > }); > } > } _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel