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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1D10CE46D for ; Fri, 22 Apr 2022 14:16:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0A3D427EB4 for ; Fri, 22 Apr 2022 14:15:52 +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 87D0927EA9 for ; Fri, 22 Apr 2022 14:15:51 +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 5758F426F5 for ; Fri, 22 Apr 2022 14:15:51 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 22 Apr 2022 14:15:48 +0200 Message-Id: <20220422121548.69146-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.088 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 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] api: replication: don't send mails about failed replication only once 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, 22 Apr 2022 12:16:22 -0000 but rather multiple times becoming exponentially less frequent. Suggested-by: Thomas Lamprecht Signed-off-by: Fabian Ebner --- PVE/API2/Replication.pm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Replication.pm b/PVE/API2/Replication.pm index a1bcd89b..a7e54497 100644 --- a/PVE/API2/Replication.pm +++ b/PVE/API2/Replication.pm @@ -74,6 +74,19 @@ sub run_single_job { sub run_jobs { my ($now, $logfunc, $verbose, $mail) = @_; + my $mail_at_fail_count = sub { + my ($fail_count) = @_; + + return 1 if $fail_count == 1; + + # failing job is re-tried every half hour, try to send one mail after 1, 2, 4, 8, etc. days + my $i = 1; + while ($i * 48 < $fail_count) { + $i = $i * 2; + } + return $i * 48 == $fail_count; + }; + my $iteration = $now // time(); my $code = sub { @@ -93,7 +106,7 @@ sub run_jobs { my $jobstate = PVE::ReplicationState::extract_job_state($state, $jobcfg); eval { PVE::Tools::sendmail('root', "Replication Job: $jobcfg->{id} failed", $err) - if $jobstate->{fail_count} == 1 && $mail; + if $mail && $mail_at_fail_count->($jobstate->{fail_count}); }; warn ": $@" if $@; } -- 2.30.2