manual rollbacks on MySQL

buildbot · May 31, 2011 · 0223914 · 0223914
1 parent 498a6c4
commit 0223914
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/master/buildbot/db/buildrequests.py b/master/buildbot/db/buildrequests.py
@@ -240,11 +240,17 @@ def thd(conn):
                 # if no rows or too few rows were updated, then we failed; this
                 # will roll back the transaction
                 if updated_rows != len(brids):
+                    # MySQL doesn't do transactions, so roll this back manually
+                    if conn.engine.dialect.name == 'mysql':
+                        alreadyClaimed(conn, tmp)
                     transaction.rollback()
                     raise AlreadyClaimedError
 
                 transaction.commit()
             except (sa.exc.ProgrammingError, sa.exc.IntegrityError):
+                # MySQL doesn't do transactions, so roll this back manually
+                if conn.engine.dialect.name == 'mysql':
+                    alreadyClaimed(conn, tmp)
                 transaction.rollback()
                 raise AlreadyClaimedError