Commit graph

4338 commits

Author SHA1 Message Date
Joey Hess
ec8ba6bf58 Merge branch 'master' into assistant 2012-07-07 11:51:19 -06:00
Joey Hess
7e76e49b9f fixed 2012-07-07 11:48:59 -06:00
Joey Hess
9379c77fb3 split transfer info and lock files
Since the lock file has to be kept open, this prevented the TransferWatcher
from noticing when it appeared, since inotify (and more importantly kqueue)
events happen when a new file is closed. Writing a separate info file fixes
that problem.
2012-07-07 11:47:36 -06:00
Joey Hess
208e96deef Merge branch 'master' into assistant 2012-07-07 11:23:28 -06:00
Joey Hess
c8691d76aa bugfix 2012-07-07 11:17:20 -06:00
Joey Hess
3247415c56 update; split out hard todo 2012-07-07 11:12:11 -06:00
Joey Hess
8939ef3121 Merge remote-tracking branch 'origin/assistant' into assistant
Conflicts:
	Assistant/TransferSlots.hs
2012-07-07 10:58:06 -06:00
Joey Hess
eb9063c0d1 update 2012-07-07 10:56:09 -06:00
Joey Hess
cd168c6cba fix transferrer thread's use of transfer slots and transfer info files
Check first if a transfer needs to be done, using the location log only
(for speed), and avoid occupying a slot if not. Always write a transfer
info file, and keep it open throughout the tranfer process.

Now transfers to remotes seem reliable.
2012-07-07 10:50:20 -06:00
https://www.google.com/accounts/o8/id?id=AItOawmWQTrnPloMWiPFg8Y2Y5g-2IYe26D0KKw
583cfb5667 Added a comment 2012-07-07 16:18:08 +00:00
Joey Hess
cc6f660752 fix transfer slots blocking and refilling when transfers are stopped
There's a bug, if a transfer process notices it needs to do nothing,
it never starts the transfer, so the slot is never freed.
2012-07-06 21:59:45 -06:00
Joey Hess
94b06deb64 fix transfer slots blocking and refilling when transfers are stopped 2012-07-06 21:45:08 -06:00
Joey Hess
9bcfbc4048 todo 2012-07-06 21:17:21 -06:00
Joey Hess
d954a0ce59 fixed close-together transfer race
The issue involved forking and they trying to read from a MVar. Reading the
MVar 1st fixed it.
2012-07-06 18:48:51 -06:00
Joey Hess
d6f65aed16 Merge branch 'master' into assistant
Conflicts:
	doc/design/assistant/syncing.mdwn
2012-07-06 18:26:40 -06:00
Joey Hess
8ad844e45c fix leading period before two-element extensions 2012-07-06 17:22:56 -06:00
Joey Hess
2c4b39be4f blog for the day 2012-07-06 17:06:05 -06:00
Joey Hess
62876502c5 wait on child transfer processes, and invalidate cache
There's still a bug; if the child updates its transfer info file,
then the data from it will superscede the TransferInfo, losing the
info that we should wait on this child.
2012-07-06 16:44:13 -06:00
Joey Hess
4a10795144 logic error 2012-07-06 15:07:42 -06:00
Joey Hess
27ac0ec332 ssh connection caching is ok, but there is another problem 2012-07-06 14:58:30 -06:00
Joey Hess
8489419deb todo 2012-07-06 14:56:41 -06:00
Joey Hess
3d30a45e72 simplified
background transferrs seem to work now
2012-07-06 14:54:07 -06:00
Joey Hess
430ad8ce85 it builds again
Currently nothing waits on transfer processes.

(Second drive of the day fried. Not concentrating very well.)
2012-07-06 16:41:37 -04:00
Joey Hess
8795a392c3 fix 2012-07-06 16:30:55 -04:00
Joey Hess
721748135b fix build (almost) 2012-07-06 14:42:45 -04:00
Joey Hess
bde355a65b reorg, and add a link to a good forum post todo 2012-07-06 14:21:26 -04:00
Joey Hess
1024e5885f Merge branch 'master' of ssh://git-annex.branchable.com 2012-07-06 12:06:28 -06:00
http://joeyh.name/
1cae1bf79c Added a comment 2012-07-06 13:04:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
7a5229eb3b 2012-07-06 08:48:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncBlzaDI248OZGjKQMXrLVQIx4XrZrzFo
4104785bcb 2012-07-06 08:10:00 +00:00
Joey Hess
a92f5589fc unfinished (and unbuildable) work toward separate transfer processes 2012-07-05 18:57:06 -06:00
http://joeyh.name/
c944f50fc1 Added a comment 2012-07-06 00:21:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawldKnauegZulM7X6JoHJs7Gd5PnDjcgx-E
f5cb8ed690 Added a comment: Source code 2012-07-06 00:12:16 +00:00
Joey Hess
0c563c39df Merge branch 'master' into assistant 2012-07-05 17:35:19 -06:00
Joey Hess
f462520bf9 todo 2012-07-05 16:41:17 -06:00
Joey Hess
880b55f277 Merge branch 'master' into assistant 2012-07-05 16:27:09 -06:00
Joey Hess
5a753a7b8a SHAnE backends are now smarter about composite extensions, such as .tar.gz Closes: #680450 2012-07-05 16:24:02 -06:00
Joey Hess
9eaba58dd9 run transfer with copy of annex state
This should have made it run concurrently with other annex actions,
but I'm still seeing it serialize. Perhaps I need to forkProcess?
2012-07-05 16:07:49 -06:00
Joey Hess
25701717eb Merge branch 'master' of ssh://git-annex.branchable.com 2012-07-05 14:49:21 -06:00
Joey Hess
b1629356ce blog for the day
major milestone today!
2012-07-05 14:47:10 -06:00
Joey Hess
2136ee4adb logic error 2012-07-05 14:45:21 -06:00
Joey Hess
71b5ad8398 wrote transfer thread
finally!
2012-07-05 14:34:20 -06:00
Joey Hess
e8df726d07 Merge branch 'master' into assistant 2012-07-05 11:05:24 -06:00
http://joeyh.name/
08d6e6903b Added a comment 2012-07-05 17:04:34 +00:00
Joey Hess
bd2c4c982d update 2012-07-05 11:01:53 -06:00
Joey Hess
6af319d8cd enqueue Downloads when new symlinks appear to content we don't have 2012-07-05 10:58:49 -06:00
Joey Hess
c8135ea0a8 split logic for uploads and downloads 2012-07-05 10:44:07 -06:00
Joey Hess
b7c3cc2745 Merge branch 'master' into assistant 2012-07-05 10:34:52 -06:00
Joey Hess
c1728849a9 update 2012-07-05 10:34:47 -06:00
Joey Hess
83c66ccaf8 queue Uploads of newly added files to remotes
Added knownRemotes to DaemonStatus. This list is not entirely trivial to
calculate, and having it here should make it easier to add/remove remotes
on the fly later on. It did require plumbing the daemonstatus through to
some more threads.
2012-07-05 10:21:22 -06:00