From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 34F8A1FF0B0 for ; Fri, 09 Oct 2026 16:53:47 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 0487F21671; Fri, 09 Oct 2026 16:53:46 +0200 (CEST) From: Jonas Theisen To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox v3 01/10] fix #7904: Add 'disable' to {sync,verify,tape,gc} job schema and datastore config Date: Fri, 9 Oct 2026 16:53:10 +0200 Message-ID: <20261009145328.281554-2-j.theisen@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261009145328.281554-1-j.theisen@proxmox.com> References: <20261009145328.281554-1-j.theisen@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1791557621130 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.171 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) 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 Message-ID-Hash: YZZJPD7JUXMT75C6JLK5BPMBULA32PFQ X-Message-ID-Hash: YZZJPD7JUXMT75C6JLK5BPMBULA32PFQ X-MailFrom: j.theisen@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: To be able to en-/disable the respective jobs this patch adds the "disable" field to the job config and the needed schema. This also adds the gc_disable parameter to the datastore config to allow this type of job to be disabled. Fixes: https://bugzilla.proxmox.com/show_bug.cgi?id=7904 Signed-off-by: Jonas Theisen --- pbs-api-types/src/datastore.rs | 17 +++++++++++++++++ pbs-api-types/src/jobs.rs | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs index 93ccaf07..b8ef7509 100644 --- a/pbs-api-types/src/datastore.rs +++ b/pbs-api-types/src/datastore.rs @@ -460,6 +460,11 @@ pub const COUNTER_RESET_SCHEDULE_SCHEMA: Schema = optional: true, schema: SINGLE_LINE_COMMENT_SCHEMA, }, + "gc-disable": { + description: "Disable scheduled execution of garbage collection.", + optional: true, + type: Boolean, + }, "gc-schedule": { optional: true, schema: GC_SCHEDULE_SCHEMA, @@ -524,6 +529,10 @@ pub struct DataStoreConfig { #[serde(skip_serializing_if = "Option::is_none")] pub comment: Option, + #[serde(default, skip_serializing_if = "is_false")] + #[updater(serde(skip_serializing_if = "Option::is_none"))] + pub gc_disable: bool, + #[serde(skip_serializing_if = "Option::is_none")] pub gc_schedule: Option, @@ -605,6 +614,7 @@ impl DataStoreConfig { name, path, comment: None, + gc_disable: Default::default(), gc_schedule: None, gc_on_unmount: None, prune_schedule: None, @@ -1704,6 +1714,9 @@ pub struct GarbageCollectionJobStatus { pub store: String, #[serde(flatten)] pub status: GarbageCollectionStatus, + /// Is this job disabled + #[serde(default)] + pub disable: bool, /// Schedule of the gc job #[serde(skip_serializing_if = "Option::is_none")] pub schedule: Option, @@ -1721,6 +1734,10 @@ pub struct GarbageCollectionJobStatus { pub duration: Option, } +fn is_false(b: &bool) -> bool { + !b +} + #[api( properties: { "gc-status": { diff --git a/pbs-api-types/src/jobs.rs b/pbs-api-types/src/jobs.rs index 9a5d2b77..73d7c13f 100644 --- a/pbs-api-types/src/jobs.rs +++ b/pbs-api-types/src/jobs.rs @@ -228,6 +228,11 @@ pub const VERIFICATION_OUTDATED_AFTER_SCHEMA: Schema = optional: true, schema: VERIFICATION_SCHEDULE_SCHEMA, }, + disable: { + type: Boolean, + optional: true, + default: false, + }, ns: { optional: true, schema: BACKUP_NAMESPACE_SCHEMA, @@ -267,6 +272,10 @@ pub struct VerificationJobConfig { #[serde(skip_serializing_if = "Option::is_none")] /// when to schedule this job in calendar event notation pub schedule: Option, + /// Disable this job. + #[serde(default, skip_serializing_if = "is_false")] + #[updater(serde(skip_serializing_if = "Option::is_none"))] + pub disable: bool, #[serde(skip_serializing_if = "Option::is_none", default)] /// on which backup namespace to run the verification recursively pub ns: Option, @@ -403,6 +412,11 @@ pub struct TapeBackupJobSetup { optional: true, schema: SYNC_SCHEDULE_SCHEMA, }, + disable: { + type: Boolean, + optional: true, + default: false, + }, } )] #[derive(Serialize, Deserialize, Clone, Updater, PartialEq)] @@ -417,6 +431,10 @@ pub struct TapeBackupJobConfig { pub comment: Option, #[serde(skip_serializing_if = "Option::is_none")] pub schedule: Option, + /// Disable this job. + #[serde(default, skip_serializing_if = "is_false")] + #[updater(serde(skip_serializing_if = "Option::is_none"))] + pub disable: bool, } #[api( @@ -642,6 +660,11 @@ pub const UNMOUNT_ON_SYNC_DONE_SCHEMA: Schema = optional: true, schema: SYNC_SCHEDULE_SCHEMA, }, + disable: { + type: Boolean, + optional: true, + default: false, + }, "group-filter": { schema: GROUP_FILTER_LIST_SCHEMA, optional: true, @@ -717,6 +740,10 @@ pub struct SyncJobConfig { pub comment: Option, #[serde(skip_serializing_if = "Option::is_none")] pub schedule: Option, + /// Disable this job. + #[serde(default, skip_serializing_if = "is_false")] + #[updater(serde(skip_serializing_if = "Option::is_none"))] + pub disable: bool, #[serde(skip_serializing_if = "Option::is_none")] pub group_filter: Option>, #[serde(flatten)] -- 2.47.3