dont rollback to savepoints on deadlock

laravel · Oct 15, 2016 · 5e34cd1 · 5e34cd1
1 parent 4de2ece
commit 5e34cd1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -576,6 +576,14 @@ public function transaction(Closure $callback, $attempts = 1)
             // up in the database. Then we'll re-throw the exception so it can
             // be handled how the developer sees fit for their applications.
             catch (Exception $e) {
+                // On deadlock, if this is a nested transaction, we cannot retry.
+                // the outer most transaction is rolled back by the server
+                // so we shouldn't rollback to save points.
+                if ($this->causedByDeadlock($e) && $this->transactions > 1) {
+                    --$this->transactions;
+                    throw $e;
+                }
+
                 $this->rollBack();
 
                 if ($this->causedByDeadlock($e) && $a < $attempts) {