From patchwork Fri Dec 2 16:21:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9458867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C04760515 for ; Fri, 2 Dec 2016 16:24:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A3E028578 for ; Fri, 2 Dec 2016 16:24:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7ED972857B; Fri, 2 Dec 2016 16:24:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E387228578 for ; Fri, 2 Dec 2016 16:24:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCqaq-0005qe-UC; Fri, 02 Dec 2016 16:21:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCqap-0005qU-Jf for xen-devel@lists.xenproject.org; Fri, 02 Dec 2016 16:21:47 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 67/3B-24885-A9F91485; Fri, 02 Dec 2016 16:21:46 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRWlGSWpSXmKPExsXitHRDpO6s+Y4 RBn1LJCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxV3U1MBSu5Km4t+cnYwLifo4uRg0NCwF9i y9P0LkZODjYBXYmmLX/ZQMIiAioSt/cagJjMAqESO15YglQICyRInDl8lwXEZgGq6O58xghSw ivgIXF7pSlIWEJATuL88Z/MIGEhATWJuevjQcK8AoISJ2c+AetkFpCQOPjiBfMERu5ZSFKzkK QWMDKtYtQoTi0qSy3SNbLQSyrKTM8oyU3MzNE1NDDWy00tLk5MT81JTCrWS87P3cQIDIF6Bgb GHYztJ/wOMUpyMCmJ8prmOEYI8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuB9Ow8oJ1iUmp5akZaZ AwxGmLQEB4+SCO8PkDRvcUFibnFmOkTqFKOilDjvepCEAEgiozQPrg0WAZcYZaWEeRkZGBiEe ApSi3IzS1DlXzGKczAqCfPKAONJiCczrwRu+iugxUxAizuu24MsLklESEkBY0r1u97SN4L2x4 WjPl0zk/MTc1zIIzDP1/NbzqtTIltbmB/dS6moTGKs/bHkx/I5/fuefEozOnDLqyrvcnrf41M L5Y43JlYEVtze1Xfpu3Kuw+F43QPLTB9IWV1IzO75PH31JtPm+eKqb1he7eipaOZ9ry6en8T0 dMmp2ysj5QRPf5ho/OfIKiWW4oxEQy3mouJEANuobpV7AgAA X-Env-Sender: prvs=13734adc3=Ian.Jackson@citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1480695704!66573820!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34395 invoked from network); 2 Dec 2016 16:21:46 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 2 Dec 2016 16:21:46 -0000 X-IronPort-AV: E=Sophos;i="5.33,287,1477958400"; d="scan'208";a="392729561" From: Ian Jackson To: Date: Fri, 2 Dec 2016 16:21:36 +0000 Message-ID: <1480695696-3670-1-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST v1.1 PATCH 2.1/3] Executive database: Handle 40001 "SERIALIZATION FAILURE" too X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This can happen if the locks are removed, which we are about to do. Signed-off-by: Ian Jackson --- Osstest/JobDB/Executive.pm | 3 ++- tcl/JobDB-Executive.tcl | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm index 557cee1..c3fd449 100644 --- a/Osstest/JobDB/Executive.pm +++ b/Osstest/JobDB/Executive.pm @@ -54,7 +54,8 @@ sub need_retry ($$$) { my ($jd, $dbh,$committing) = @_; return ($dbh_tests->err() // 0)==7 && - ($dbh_tests->state =~ m/^40P01/); # DEADLOCK DETECTED + ($dbh_tests->state =~ m/^(?:40P01|40001)/); + # DEADLOCK DETECTED or SERIALIZATION FAILURE } sub current_flight ($) { #method diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl index 6225bd9..6eb43f6 100644 --- a/tcl/JobDB-Executive.tcl +++ b/tcl/JobDB-Executive.tcl @@ -382,8 +382,9 @@ proc transaction {tables script {autoreconnect 0}} { db-close if {$rc} { switch -glob $errorCode { - {OSSTEST-PSQL * 40P01} { - # DEADLOCK DETECTED + {OSSTEST-PSQL * 40P01} - + {OSSTEST-PSQL * 40001} { + # DEADLOCK DETECTED or SERIALIZATION FAILURE db-execute ROLLBACK logputs stdout "transaction deadlock ($result) retrying ..." if {[incr retries -1] <= 0} {