objectcache: make BagOStuff::mergeViaLock() timeout more sensible
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 11 Jul 2018 22:54:24 +0000 (23:54 +0100)
committerAaron Schulz <aschulz@wikimedia.org>
Thu, 12 Jul 2018 15:02:38 +0000 (16:02 +0100)
commitb8779134ed9a06a587e56f864fbcb803c8bcb374
treed641ede390b6158a2e3a48a8dadfb46e6648546e
parent1828e901ab987157d78acedf52f607ebe21ddc6e
objectcache: make BagOStuff::mergeViaLock() timeout more sensible

Interpret "1 attempt" as non-blocking and use 3 seconds otherwise
(instead of 6 seconds). This means that the WAN cache merge call
does not block.

Bug: T198239
Change-Id: Ieb194a949f18785c2cc9dd20fdc4d2e3fed51abf
includes/libs/objectcache/BagOStuff.php
tests/phpunit/includes/libs/objectcache/BagOStuffTest.php