revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-22 12:41:19 +01:00
Code Issues Releases Wiki Activity

Prevent interruption by the PHP "set_time_limit()" mechanism while holding the durable write lock

Browse source 
Summary:
Ref T13590. By default, PHP kills execution after web scripts run for 30 seconds. If this occurs in the locked section of a repository write while we're holding the durable write lock, the lock will get stuck.

Use "set_time_limit(0)" to prevent this mechanism from interrupting execution while the durable lock is held.

Test Plan:
  - Added "set_time_limit(1)" before the lock and "while (1);" in the critical section of the lock.
  - Pushed, got the lock stuck.
  - Cleared the lock, applied this patch, pushed.
  - Got an infinite hang instead. (Normally, we expect the script to take more than 30 seconds to execute because there is a large push that executes in finite time, not because there's an infinte loop.)

Maniphest Tasks: T13590

Differential Revision: https://secure.phabricator.com/D21526
This commit is contained in:
epriestley 2021-01-26 15:54:09 -08:00
parent da7d92dd0a
commit b4f2cef76c
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
View file

@ -318,6 +318,11 @@ final class DiffusionRepositoryClusterEngine extends Phobject {
'Acquiring write lock for repository "%s"...', 'Acquiring write lock for repository "%s"...',
$repository->getDisplayName())); $repository->getDisplayName()));
// See T13590. On the HTTP pathway, it's possible for us to hit the script
// time limit while holding the durable write lock if a user makes a big
// push. Remove the time limit before we acquire the durable lock.
set_time_limit(0);
$lock_wait = phutil_units('2 minutes in seconds'); $lock_wait = phutil_units('2 minutes in seconds');
try { try {
$write_wait_start = microtime(true); $write_wait_start = microtime(true);