@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Allow PhabricatorGlobalLock to block
Summary: See D2924.
Test Plan: Ran locks with blocking timeouts.
Reviewers: btrahan
Reviewed By: btrahan
CC: aran
Differential Revision: https://secure.phabricator.com/D2925
+3
-3
+3
-3
src/infrastructure/util/PhabricatorGlobalLock.php
+3
-3
src/infrastructure/util/PhabricatorGlobalLock.php
···
63
63
64
64
/* -( Implementation )----------------------------------------------------- */
65
65
66
-
protected function doLock() {
66
+
protected function doLock($wait) {
67
67
$conn = $this->conn;
68
68
if (!$conn) {
69
69
// NOTE: Using the 'repository' database somewhat arbitrarily, mostly
···
87
87
88
88
$result = queryfx_one(
89
89
$conn,
90
-
'SELECT GET_LOCK(%s, %d)',
90
+
'SELECT GET_LOCK(%s, %f)',
91
91
'phabricator:'.$this->lockname,
92
-
0);
92
+
$wait);
93
93
94
94
$ok = head($result);
95
95
if (!$ok) {