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 BC584733D0 for ; Fri, 27 May 2022 08:23:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AF696A574 for ; Fri, 27 May 2022 08:23:55 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7D87CA566 for ; Fri, 27 May 2022 08:23:54 +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 47AF843750; Fri, 27 May 2022 08:23:48 +0200 (CEST) Message-ID: <65125da7-f122-9b18-5fc1-93cfccd79475@proxmox.com> Date: Fri, 27 May 2022 08:23:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:101.0) Gecko/20100101 Thunderbird/101.0 Content-Language: en-US To: Thomas Lamprecht , Proxmox VE development discussion References: <20220524114116.2543812-1-d.csapak@proxmox.com> <20220524114116.2543812-2-d.csapak@proxmox.com> From: Dominik Csapak In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.112 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 NICE_REPLY_A -1.995 Looks like a legit reply (A) 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 - Subject: Re: [pve-devel] [PATCH guest-common 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, 27 May 2022 06:23:55 -0000 On 5/25/22 16:30, Thomas Lamprecht wrote: > On 24/05/2022 13:41, Dominik Csapak wrote: >> 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 >> --- >> src/PVE/ReplicationState.pm | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/src/PVE/ReplicationState.pm b/src/PVE/ReplicationState.pm >> index 8eebb42..ae6b1fb 100644 >> --- a/src/PVE/ReplicationState.pm >> +++ b/src/PVE/ReplicationState.pm >> @@ -322,7 +322,9 @@ sub get_next_job { >> return $res if $res != 0; >> $res = $joba->{next_sync} <=> $jobb->{next_sync}; >> return $res if $res != 0; >> - return $joba->{guest} <=> $jobb->{guest}; >> + $res = $joba->{guest} <=> $jobb->{guest}; >> + return $res if $res != 0; >> + return $a cmp $b; > > nit, but couldn't this be > > return $joba->{guest} <=> $jobb->{guest} || $a cmp $b; > > instead, the right side of the logical OR only gets evaluated if the left side's > result is 0 (well also on undef and empty string "", but that cannot happen > with the spaceship operator). > yeah sure, i just blindly copied from the lines above. do we want to change that pattern for all of them? like this: --- 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) { >