assistant: Fix bug that caused it to stall when adding a very large number of files at once (around 5 thousand).

This bug was introduced in 82a6db8fe8,
which improved handling of adding very large numbers of files by ensuring
that a minimum number of max size commits (5000 files each) were done.

I accidentially made it wait for another change to appear after such a max
size commit, even if a lot of queued changes were already accumulated.
That resulted in a stall when it got to the end. Now fixed to not wait
any longer than necessary to ensure the watcher has had time to wake back
up after the max size commit.

This commit was sponsored by Michael Linksvayer. Thanks!
This commit is contained in:
Joey Hess 2013-07-27 17:41:41 -04:00
parent 9fb6d7263b
commit 869c638b82
2 changed files with 20 additions and 10 deletions

2
debian/changelog vendored
View file

@ -19,6 +19,8 @@ git-annex (4.20130724) UNRELEASED; urgency=low
remote.<name>.annex-sync set to false.
* assistant: Fix deadlock that could occur when adding a lot of files
at once in indirect mode.
* assistant: Fix bug that caused it to stall when adding a very large
number of files at once (around 5 thousand).
-- Joey Hess <joeyh@debian.org> Tue, 23 Jul 2013 12:39:48 -0400