diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-25 16:02:17 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-25 17:40:23 -0400 |
| commit | 9785222714d65ded2274723c8b0a210c6152ea36 (patch) | |
| tree | 2cc0a99fbe0dd9f4924aa5b7e5bbbfe36e7cb80b /CHANGELOG | |
| parent | bb803411fb99e482dca0c1c0aa740f28b4a98820 (diff) | |
Fix transfer log file locking problem when running concurrent transfers.
orElse is great, but was not the right thing to use here because
waitTakeLock could retry for other reasons than the lock being held,
which made tryTakeLock fail when it shouldn't.
Instead, move the code to tryTakeLock and implement waitTakeLock using
tryTakeLock and retry.
(Also, in runTransfer, when checkSaneLock fails, dropLock to avoid leaking a
lock handle.)
This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4,6 +4,8 @@ git-annex (6.20170520) UNRELEASED; urgency=medium exclamation mark, which forces gpg to use a specific subkey. * Improve progress display when watching file size, in cases where a transfer does not resume. + * Fix transfer log file locking problem when running concurrent + transfers. -- Joey Hess <id@joeyh.name> Wed, 24 May 2017 14:03:40 -0400 |