Page MenuHomePhabricator
Files F15415445

D15789.diff
No OneTemporary
Actions

D15789.diff
View Options

diff --git a/src/aphront/storage/connection/AphrontDatabaseConnection.php b/src/aphront/storage/connection/AphrontDatabaseConnection.php
--- a/src/aphront/storage/connection/AphrontDatabaseConnection.php
+++ b/src/aphront/storage/connection/AphrontDatabaseConnection.php
@@ -10,6 +10,7 @@
private $transactionState;
private $readOnly;
private $queryTimeout;
+ private $locks = array();
abstract public function getInsertID();
abstract public function getAffectedRows();
@@ -67,6 +68,48 @@
}
+/* -( Global Locks )------------------------------------------------------- */
+
+
+ public function rememberLock($lock) {
+ if (isset($this->locks[$lock])) {
+ throw new Exception(
+ pht(
+ 'Trying to remember lock "%s", but this lock has already been '.
+ 'remembered.',
+ $lock));
+ }
+
+ $this->locks[$lock] = true;
+ return $this;
+ }
+
+
+ public function forgetLock($lock) {
+ if (empty($this->locks[$lock])) {
+ throw new Exception(
+ pht(
+ 'Trying to forget lock "%s", but this connection does not remember '.
+ 'that lock.',
+ $lock));
+ }
+
+ unset($this->locks[$lock]);
+ return $this;
+ }
+
+
+ public function forgetAllLocks() {
+ $this->locks = array();
+ return $this;
+ }
+
+
+ public function isHoldingAnyLock() {
+ return (bool)$this->locks;
+ }
+
+
/* -( Transaction Management )--------------------------------------------- */
diff --git a/src/aphront/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php b/src/aphront/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php
--- a/src/aphront/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php
+++ b/src/aphront/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php
@@ -184,6 +184,8 @@
$this->throwQueryException($this->connection);
} catch (AphrontConnectionLostQueryException $ex) {
+ $can_retry = ($retries > 0);
+
if ($this->isInsideTransaction()) {
// Zero out the transaction state to prevent a second exception
// ("program exited with open transaction") from being thrown, since
@@ -193,17 +195,17 @@
$state->decreaseDepth();
}
- // We can't close the connection before this because
- // isInsideTransaction() and getTransactionState() depend on the
- // connection.
- $this->close();
+ $can_retry = false;
+ }
- throw $ex;
+ if ($this->isHoldingAnyLock()) {
+ $this->forgetAllLocks();
+ $can_retry = false;
}
$this->close();
- if (!$retries) {
+ if (!$can_retry) {
throw $ex;
}
}

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 21, 6:01 AM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7715067
Default Alt Text
D15789.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility