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 B9AF87F4B9 for ; Fri, 12 Nov 2021 13:30:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B00091998A for ; Fri, 12 Nov 2021 13:30:28 +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 0C48919979 for ; Fri, 12 Nov 2021 13:30:28 +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 D18B544BB3 for ; Fri, 12 Nov 2021 13:30:27 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 12 Nov 2021 13:30:17 +0100 Message-Id: <20211112123019.15384-5-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211112123019.15384-1-h.laimer@proxmox.com> References: <20211112123019.15384-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.078 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 v4 proxmox-backup 4/6] api2: make maintenance_type updatable 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, 12 Nov 2021 12:30:28 -0000 --- v3->v4: remove check for conflicting tasks. Tasks should not perform lookups after they have started, therefore alreday running tasks will not be interupted by an updated maintenance type. src/api2/config/datastore.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index b9367469..b410a31f 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -183,6 +183,8 @@ pub enum DeletableProperty { notify_user, /// Delete the notify property notify, + /// Delete the maintenance-type property + maintenance_type, } #[api( @@ -249,6 +251,7 @@ pub fn update_datastore( DeletableProperty::verify_new => { data.verify_new = None; }, DeletableProperty::notify => { data.notify = None; }, DeletableProperty::notify_user => { data.notify_user = None; }, + DeletableProperty::maintenance_type => { data.maintenance_type = None; }, } } } @@ -294,6 +297,8 @@ pub fn update_datastore( if update.notify_user.is_some() { data.notify_user = update.notify_user; } + if update.maintenance_type.is_some() { data.maintenance_type = update.maintenance_type; } + config.set_data(&name, "datastore", &data)?; pbs_config::datastore::save_config(&config)?; -- 2.30.2