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 F056C80D2D for ; Fri, 19 Nov 2021 16:24:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC7942CF30 for ; Fri, 19 Nov 2021 16:23:30 +0100 (CET) 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 95D4D2CF25 for ; Fri, 19 Nov 2021 16:23:29 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 420094401B for ; Fri, 19 Nov 2021 16:23:29 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 19 Nov 2021 16:23:28 +0100 Message-Id: <20211119152328.1866593-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211119152328.1866593-1-d.csapak@proxmox.com> References: <20211119152328.1866593-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.209 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 2/2] datastore: improve error on maintenance mode failure with empty message 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: Fri, 19 Nov 2021 15:24:01 -0000 Signed-off-by: Dominik Csapak --- pbs-datastore/src/datastore.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 9cb19e79..e03935bd 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -214,7 +214,11 @@ impl DataStore { match (&config.maintenance_type, operation.clone()) { (Some(MaintenanceType::ReadOnly(message)), Some(Operation::Write)) | (Some(MaintenanceType::Offline(message)), Some(_)) => { - bail!("Datastore '{}' is in maintenance mode: {}", name, message); + if message.is_empty() { + bail!("Datastore '{}' is in maintenance mode", name); + } else { + bail!("Datastore '{}' is in maintenance mode: {}", name, message); + } }, (_, Some(operation)) => update_active_operations(name, operation, 1)?, _ => {} -- 2.30.2