D16739.id40313.diff
No OneTemporary
Actions

Size

925 B

Referenced Files

None

Subscribers

None

D16739.id40313.diff
View Options

	diff --git a/src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php b/src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php
	--- a/src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php
	+++ b/src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php
	@@ -98,7 +98,27 @@
	}
	}

	- return $this->collectGarbage();
	+ // Hold a lock while performing collection to avoid racing other daemons
	+ // running the same collectors.
	+ $lock_name = 'gc:'.$this->getCollectorConstant();
	+ $lock = PhabricatorGlobalLock::newLock($lock_name);
	+
	+ try {
	+ $lock->lock(5);
	+ } catch (PhutilLockException $ex) {
	+ return false;
	+ }
	+
	+ try {
	+ $result = $this->collectGarbage();
	+ } catch (Exception $ex) {
	+ $lock->unlock();
	+ throw $ex;
	+ }
	+
	+ $lock->unlock();
	+
	+ return $result;
	}