diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 23:36:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 23:36:53 -0400 |
| commit | 7523a9d447483f0e68d1bc1055df735389208f25 (patch) | |
| tree | 4461054038f08f4782e3ac5ddb60ae1ba464ba33 /debian | |
| parent | ea27533db0f4949474750a089b77961355eb60b9 (diff) | |
Fix minor FD leak in journal code.
Minor because normally only 1 FD is leaked per git-annex run. However,
the test suite leaks a few hundred FDs, and this broke it on the Debian
autobuilders, which seem to have a tigher than usual ulimit.
The leak was introduced by the lazy getDirectoryContents' that was
introduced in b54de1dad4874b7561d2c5a345954b6b5c594078 in order to scale to
millions of journal files -- if the lazy list was never fully consumed, the
directory handle did not get closed.
Instead, pull in openDirectory/readDirectory/closeDirectory code that I
already developed and submitted in a patch to the haskell directory library
earlier. Using this in journalDirty avoids the place that the lazy list
caused a problem. And using it in stageJournal eliminates the need for
getDirectoryContents'.
The getJournalFiles* functions are switched back to using the regular
strict getDirectoryContents. I'm not sure if those always consume the whole
list, so this avoids any leak. And the things that call those are things
like git annex unused, which also look at every file committed to the
git-annex branch, so would need more work to scale to insane numbers of
files anyway.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c5fdcd600..b8d091925 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (5.20140710) UNRELEASED; urgency=medium + + * Fix minor FD leak in journal code. + + -- Joey Hess <joeyh@debian.org> Wed, 09 Jul 2014 23:29:21 -0400 + git-annex (5.20140709) unstable; urgency=medium * Fix race in direct mode merge code that could cause all files in the |