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 D17C99266 for ; Tue, 26 Apr 2022 08:24:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CFC49E68A for ; Tue, 26 Apr 2022 08:24:21 +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 8FD37E51E for ; Tue, 26 Apr 2022 08:24:17 +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 61DFB42A99 for ; Tue, 26 Apr 2022 08:24:17 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 26 Apr 2022 06:23:31 +0000 Message-Id: <20220426062335.6215-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220426062335.6215-1-h.laimer@proxmox.com> References: <20220426062335.6215-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -1.563 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% ENA_SUBJ_ODD_CASE 3.2 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. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 2/6] api2: DataStoreListItem add maintenance info 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: Tue, 26 Apr 2022 06:24:21 -0000 Signed-off-by: Hannes Laimer --- pbs-api-types/src/datastore.rs | 8 ++++++++ src/api2/admin/datastore.rs | 1 + 2 files changed, 9 insertions(+) diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs index 2bff64b5..fec0c3ad 100644 --- a/pbs-api-types/src/datastore.rs +++ b/pbs-api-types/src/datastore.rs @@ -354,6 +354,11 @@ impl DataStoreConfig { optional: true, schema: SINGLE_LINE_COMMENT_SCHEMA, }, + maintenance: { + optional: true, + format: &ApiStringFormat::PropertyString(&MaintenanceMode::API_SCHEMA), + type: String, + } }, )] #[derive(Serialize, Deserialize)] @@ -362,6 +367,9 @@ impl DataStoreConfig { pub struct DataStoreListItem { pub store: String, pub comment: Option, + /// If the datastore is in maintenance mode, information about it + #[serde(skip_serializing_if = "Option::is_none")] + pub maintenance: Option, } #[api( diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 9f7acd0d..dcc4e1c1 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1030,6 +1030,7 @@ pub fn get_datastore_list( list.push(DataStoreListItem { store: store.clone(), comment: data["comment"].as_str().map(String::from), + maintenance: data["maintenance-mode"].as_str().map(String::from), }); } } -- 2.30.2