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 45D5270639 for ; Fri, 3 Jun 2022 09:16:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3D0B34CFB for ; Fri, 3 Jun 2022 09:16:32 +0200 (CEST) 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 838714CE2 for ; Fri, 3 Jun 2022 09:16:31 +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 513BC43A0D for ; Fri, 3 Jun 2022 09:16:31 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 3 Jun 2022 09:16:30 +0200 Message-Id: <20220603071630.374408-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220603071630.374408-1-d.csapak@proxmox.com> References: <20220603071630.374408-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.110 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [replicationstate.pm] Subject: [pve-devel] [PATCH guest-common v2 2/2] ReplicationState: deterministically order replication jobs 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: Fri, 03 Jun 2022 07:16:32 -0000 if we have multiple jobs for the same vmid with the same schedule, the last_sync, next_sync and vmid will always be the same, so the order depends on the order of the $jobs hash (which is random; thanks perl) to have a fixed order, take the jobid also into consideration Signed-off-by: Dominik Csapak --- changes from v1: * combined all returns into one src/PVE/ReplicationState.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/PVE/ReplicationState.pm b/src/PVE/ReplicationState.pm index 8eebb42..16b3d90 100644 --- a/src/PVE/ReplicationState.pm +++ b/src/PVE/ReplicationState.pm @@ -318,11 +318,10 @@ sub get_next_job { my $jobb = $jobs->{$b}; my $sa = $joba->{state}; my $sb = $jobb->{state}; - my $res = $sa->{last_iteration} <=> $sb->{last_iteration}; - return $res if $res != 0; - $res = $joba->{next_sync} <=> $jobb->{next_sync}; - return $res if $res != 0; - return $joba->{guest} <=> $jobb->{guest}; + return $sa->{last_iteration} <=> $sb->{last_iteration} || + $joba->{next_sync} <=> $jobb->{next_sync} || + $joba->{guest} <=> $jobb->{guest} || + $a cmp $b; }; foreach my $jobid (sort $sort_func keys %$jobs) { -- 2.30.2