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 43C86707EE for ; Tue, 14 Jun 2022 11:47:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3C2981D4A5 for ; Tue, 14 Jun 2022 11:47:36 +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 BDA2A1D49C for ; Tue, 14 Jun 2022 11:47:35 +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 9106243B0D for ; Tue, 14 Jun 2022 11:47:35 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 14 Jun 2022 11:47:32 +0200 Message-Id: <20220614094732.76236-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: 0 AWL 0.047 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. [replication.pm] Subject: [pve-devel] [PATCH manager] fix #4111: replication: don't send mail when fail count is zero 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, 14 Jun 2022 09:47:36 -0000 which can happen when failing to obtain the guest's migration lock. This led to a lot of mails being sent during migration (timeout for obtaining lock is only 2 seconds and we run it in a loop). One could argue that obtaining the lock should increase the fail count, but without the lock, the job state should not be touched and even the first three mails upon migration could be considered spam. Fixes: e6b8af20 ("replication: sent always mail for first three tries and move helper") Signed-off-by: Fabian Ebner --- PVE/API2/Replication.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PVE/API2/Replication.pm b/PVE/API2/Replication.pm index 522aa3bf..af77d2f4 100644 --- a/PVE/API2/Replication.pm +++ b/PVE/API2/Replication.pm @@ -77,6 +77,10 @@ sub run_single_job { my sub _should_mail_at_failcount { my ($fail_count) = @_; + # avoid spam during migration (bug #4111): when failing to obtain the guest's migration lock, + # fail_count will be 0 + return 0 if $fail_count == 0; + return 1 if $fail_count <= 3; # always send the first few for better visibility of the issue # failing job is re-tried every half hour, try to send one mail after 1, 2, 4, 8, etc. days -- 2.30.2