[OSSTEST,v1.1,2.1/3] Executive database: Handle 40001 "SERIALIZATION FAILURE" too

Commit Message

Ian Jackson Dec. 2, 2016, 4:21 p.m. UTC

This can happen if the locks are removed, which we are about to do.

Signed-off-by: Ian Jackson <[e-mail]>
---
 Osstest/JobDB/Executive.pm | 3 ++-
 tcl/JobDB-Executive.tcl    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Patch

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} {