From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A658C4727E for ; Wed, 7 Oct 2020 18:29:05 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2040721707 for ; Wed, 7 Oct 2020 18:29:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2040721707 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.3769.11311 (Exim 4.92) (envelope-from ) id 1kQEBL-0006eZ-2D; Wed, 07 Oct 2020 18:28:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3769.11311; Wed, 07 Oct 2020 18:28:54 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQEBK-0006eK-RM; Wed, 07 Oct 2020 18:28:54 +0000 Received: by outflank-mailman (input) for mailman id 3769; Wed, 07 Oct 2020 18:28:53 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE48-00072Q-Ki for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:21:28 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id eb24c2a7-e8e3-4be2-80b3-d5f4e8342ecc; Wed, 07 Oct 2020 18:20:08 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDjz-0007CF-2x; Wed, 07 Oct 2020 19:00:39 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE48-00072Q-Ki for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:21:28 +0000 X-Inumbo-ID: eb24c2a7-e8e3-4be2-80b3-d5f4e8342ecc Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id eb24c2a7-e8e3-4be2-80b3-d5f4e8342ecc; Wed, 07 Oct 2020 18:20:08 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDjz-0007CF-2x; Wed, 07 Oct 2020 19:00:39 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 23/82] db_retry: Make the sleeps random and increasing Date: Wed, 7 Oct 2020 18:59:25 +0100 Message-Id: <20201007180024.7932-24-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201007180024.7932-1-iwj@xenproject.org> References: <20201007180024.7932-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ian Jackson When there's a thundering herd, this can run out of retries. Signed-off-by: Ian Jackson --- Osstest.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Osstest.pm b/Osstest.pm index 734c0ef6..809194f0 100644 --- a/Osstest.pm +++ b/Osstest.pm @@ -311,7 +311,8 @@ sub db_retry ($$$;$$) { my ($pre,$body) = (ref $code eq 'ARRAY') ? @$code : (sub { }, $code); - my $retries= 100; + my $max_retries= 100; + my $retry_count= 0; my $r; local $db_retry_stop; for (;;) { @@ -339,10 +340,12 @@ sub db_retry ($$$;$$) { }; last if !length $@; die $@ unless $mjobdb->need_retry($dbh, $committing); - die "$dbh $body $@ ?" unless $retries-- > 0; + die "$dbh $body $@ GIVING UP ?" if ++$retry_count >= $max_retries; eval { $dbh->rollback(); }; - print STDERR "DB conflict (messages above may refer); retrying...\n"; - sleep(1); + my $delay = rand $retry_count; + print STDERR "DB conflict (messages above may refer);". + " retrying after $delay...\n"; + sleep($delay); } return $r; } -- 2.20.1