summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-07-27 17:41:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-07-27 17:42:18 -0400
commit3a55197bdb0c6bed93c4838f26af9bec7e414cdb (patch)
tree7fd345dc0d5fadea44ac59c7eb0ca6283b623419 /debian
parent38d0802f709fdc13b8e8bff87633fd3c17ed7ed2 (diff)
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 74c30fc1a6e88d926d07e12f4e7ffc7d897bf9f6, 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!
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d99795cb7..e191930da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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