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 273B66030E for ; Wed, 7 Oct 2020 11:04:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A001F2C950 for ; Wed, 7 Oct 2020 11:03:38 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 682742C8D3 for ; Wed, 7 Oct 2020 11:03:33 +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 319EC45C16 for ; Wed, 7 Oct 2020 11:03:33 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 7 Oct 2020 11:03:21 +0200 Message-Id: <20201007090324.42928-13-h.laimer@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201007090324.42928-1-h.laimer@proxmox.com> References: <20201007090324.42928-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 v2 proxmox-backup 12/15] remove verify_schedule field from datastore config endpoint 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: Wed, 07 Oct 2020 09:04:33 -0000 Signed-off-by: Hannes Laimer --- src/api2/config/datastore.rs | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index 07ca4ab8..767db1ea 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -75,10 +75,6 @@ pub fn list_datastores( optional: true, schema: PRUNE_SCHEDULE_SCHEMA, }, - "verify-schedule": { - optional: true, - schema: VERIFY_SCHEDULE_SCHEMA, - }, "keep-last": { optional: true, schema: PRUNE_SCHEMA_KEEP_LAST, @@ -133,7 +129,6 @@ pub fn create_datastore(param: Value) -> Result<(), Error> { crate::config::jobstate::create_state_file("prune", &datastore.name)?; crate::config::jobstate::create_state_file("garbage_collection", &datastore.name)?; - crate::config::jobstate::create_state_file("verify", &datastore.name)?; Ok(()) } @@ -179,8 +174,6 @@ pub enum DeletableProperty { gc_schedule, /// Delete the prune job schedule. prune_schedule, - /// Delete the verify schedule property - verify_schedule, /// Delete the keep-last property keep_last, /// Delete the keep-hourly property @@ -214,10 +207,6 @@ pub enum DeletableProperty { optional: true, schema: PRUNE_SCHEDULE_SCHEMA, }, - "verify-schedule": { - optional: true, - schema: VERIFY_SCHEDULE_SCHEMA, - }, "keep-last": { optional: true, schema: PRUNE_SCHEMA_KEEP_LAST, @@ -266,7 +255,6 @@ pub fn update_datastore( comment: Option, gc_schedule: Option, prune_schedule: Option, - verify_schedule: Option, keep_last: Option, keep_hourly: Option, keep_daily: Option, @@ -295,7 +283,6 @@ pub fn update_datastore( DeletableProperty::comment => { data.comment = None; }, DeletableProperty::gc_schedule => { data.gc_schedule = None; }, DeletableProperty::prune_schedule => { data.prune_schedule = None; }, - DeletableProperty::verify_schedule => { data.verify_schedule = None; }, DeletableProperty::keep_last => { data.keep_last = None; }, DeletableProperty::keep_hourly => { data.keep_hourly = None; }, DeletableProperty::keep_daily => { data.keep_daily = None; }, @@ -327,12 +314,6 @@ pub fn update_datastore( data.prune_schedule = prune_schedule; } - let mut verify_schedule_changed = false; - if verify_schedule.is_some() { - verify_schedule_changed = data.verify_schedule != verify_schedule; - data.verify_schedule = verify_schedule; - } - if keep_last.is_some() { data.keep_last = keep_last; } if keep_hourly.is_some() { data.keep_hourly = keep_hourly; } if keep_daily.is_some() { data.keep_daily = keep_daily; } @@ -354,10 +335,6 @@ pub fn update_datastore( crate::config::jobstate::create_state_file("prune", &name)?; } - if verify_schedule_changed { - crate::config::jobstate::create_state_file("verify", &name)?; - } - Ok(()) } @@ -400,7 +377,6 @@ pub fn delete_datastore(name: String, digest: Option) -> Result<(), Erro // ignore errors let _ = crate::config::jobstate::remove_state_file("prune", &name); let _ = crate::config::jobstate::remove_state_file("garbage_collection", &name); - let _ = crate::config::jobstate::remove_state_file("verify", &name); Ok(()) } -- 2.20.1