recover db from lock timeoutwip-rtss-killdevil

1 files changed, 4 insertions, 4 deletions

diff --git a/rtss14/database.py b/rtss14/database.py
index ec540ee..fda7d12 100755
--- a/rtss14/database.py
+++ b/rtss14/database.py
@@ -410,9 +410,9 @@ def lookup_dp_id(c, dp):
 
         except db.OperationalError, e:
             errcode = e[0]
-            if errcode == 1213:
+            if errcode == 1213 or errcode == 1205:
                 # deadlock - retry
-                print '(lookup_dp_id) Error is transaction deadlock. Will retry.'
+                print '(lookup_dp_id) Error is transaction deadlock or lock timeout. Will retry.'
                 print '(lookup_dp_id) Last query: %s' % c._last_executed
             else:
                 print e
@@ -515,9 +515,9 @@ def store_sched_result_chunk(conn, c, chunk):
 
         except db.OperationalError, e:
             errcode = e[0]
-            if errcode == 1213:
+            if errcode == 1213 or errcode == 1205:
                 # deadlock - retry
-                print '(store_sched_result_chunk) Error is transaction deadlock. Will retry.'
+                print '(store_sched_result_chunk) Error is transaction deadlock or lock timeout. Will retry.'
                 print '(store_sched_result_chunk) Last query: %s' % c._last_executed
                 rollback(conn)
             else: