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 679E18225 for ; Tue, 15 Nov 2022 11:18:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4FB9BD49 for ; Tue, 15 Nov 2022 11:18:37 +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 for ; Tue, 15 Nov 2022 11:18:36 +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 80BCC43D5D for ; Tue, 15 Nov 2022 11:18:36 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 15 Nov 2022 11:18:29 +0100 Message-Id: <20221115101830.59803-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL -0.123 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=POISEN_SPAM_PILL 0.1 Meta: its =?UTF-8?Q?spam=0A=09?=POISEN_SPAM_PILL_1 0.1 random spam to be learned in =?UTF-8?Q?bayes=0A=09?=POISEN_SPAM_PILL_3 0.1 random spam to be learned in =?UTF-8?Q?bayes=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [jobs.pm, backup.pm] Subject: [pve-devel] [PATCH manager] api: backup: auto-inject job id where expected by the API X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Nov 2022 10:18:37 -0000 for backwards compatibility. Otherwise, e.g. listing backup jobs with pvesh get /cluster/backup is broken. And suddenly not having the property anymore would be a breaking API change. Signed-off-by: Fiona Ebner --- I didn't see any other places that rely on the $job->{id} to be set. The other backup-related API calls and Jobs.pm iterate or check the ids from the section config's $parsed->{ids}. Scheduler doesn't need either AFAICT. @Dominik: I guess you need to adapt the (not-yet-applied) realm sync jobs API too now that the id is not auto-injected. PVE/API2/Backup.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Backup.pm b/PVE/API2/Backup.pm index b6f5916d..3a079874 100644 --- a/PVE/API2/Backup.pm +++ b/PVE/API2/Backup.pm @@ -130,6 +130,10 @@ __PACKAGE__->register_method({ $job->{'next-run'} = $next_run if defined($next_run); } + # FIXME remove in PVE 8.0? + # backwards compat: before moving the job registry to pve-common, id was auto-injected + $job->{id} = $jobid; + push @$res, $job; } @@ -273,7 +277,12 @@ __PACKAGE__->register_method({ my $jobs_data = cfs_read_file('jobs.cfg'); my $job = $jobs_data->{ids}->{$param->{id}}; - return $job if $job && $job->{type} eq 'vzdump'; + if ($job && $job->{type} eq 'vzdump') { + # FIXME remove in PVE 8.0? + # backwards compat: before moving the job registry to pve-common, id was auto-injected + $job->{id} = $param->{id}; + return $job; + } raise_param_exc({ id => "No such job '$param->{id}'" }); -- 2.30.2