diff options
Diffstat (limited to 'rtss14/database.py')
| -rwxr-xr-x | rtss14/database.py | 8 |
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): | |||
| 410 | 410 | ||
| 411 | except db.OperationalError, e: | 411 | except db.OperationalError, e: |
| 412 | errcode = e[0] | 412 | errcode = e[0] |
| 413 | if errcode == 1213: | 413 | if errcode == 1213 or errcode == 1205: |
| 414 | # deadlock - retry | 414 | # deadlock - retry |
| 415 | print '(lookup_dp_id) Error is transaction deadlock. Will retry.' | 415 | print '(lookup_dp_id) Error is transaction deadlock or lock timeout. Will retry.' |
| 416 | print '(lookup_dp_id) Last query: %s' % c._last_executed | 416 | print '(lookup_dp_id) Last query: %s' % c._last_executed |
| 417 | else: | 417 | else: |
| 418 | print e | 418 | print e |
| @@ -515,9 +515,9 @@ def store_sched_result_chunk(conn, c, chunk): | |||
| 515 | 515 | ||
| 516 | except db.OperationalError, e: | 516 | except db.OperationalError, e: |
| 517 | errcode = e[0] | 517 | errcode = e[0] |
| 518 | if errcode == 1213: | 518 | if errcode == 1213 or errcode == 1205: |
| 519 | # deadlock - retry | 519 | # deadlock - retry |
| 520 | print '(store_sched_result_chunk) Error is transaction deadlock. Will retry.' | 520 | print '(store_sched_result_chunk) Error is transaction deadlock or lock timeout. Will retry.' |
| 521 | print '(store_sched_result_chunk) Last query: %s' % c._last_executed | 521 | print '(store_sched_result_chunk) Last query: %s' % c._last_executed |
| 522 | rollback(conn) | 522 | rollback(conn) |
| 523 | else: | 523 | else: |
