Commit graph

3171 commits

Author SHA1 Message Date
Joey Hess
3a0cffcfed when a Download finishes, queue Uploads
This ensures file propigate takes place in situations such as: Usb drive A
is connected to B. A's master branch is already in sync with B, but it is
being used to sneakernet some files around, so B downloads those. There is no
master branch change, so C does not request these files. B needs to upload
the files it just downloaded on to C, etc.

My first try at this, I saw loops happen. B uploaded to C, which then
tried to upload back to B (because it had not received the updated
git-annex branch from B yet). B already had the file, but it still created
a transfer info file from the incoming transfer, and its watcher saw
that be removed, and tried to upload back to C.

These loops should have been fixed by my previous commit. (They never
affected ssh remotes, only local ones, it seemed.) While C might still try
to upload to B, or to some other remote that already has the file, the
extra work dies out there.
2012-09-18 14:10:33 -04:00
Joey Hess
e9238e9588 avoid starting a download for a local transfer when the remote already has the key
Turns out that recvkey already does this same check. This avoids a transfer
file being created for the download that never happened, which in turn
will avoid the assistant seeing that the download has finished, when no
transfer actually took place.
2012-09-18 13:59:03 -04:00
Joey Hess
e6d4108fad Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-17 22:37:23 -04:00
Joey Hess
9a2533cf02 blog for the day 2012-09-17 22:36:23 -04:00
Joey Hess
3c22977e44 deferred downloads
Now when a download is queued and there's no known remote to get it from,
it's added to a deferred download list, which will be retried later.

The Merger thread tries to queue any deferred downloads when it receives
a push to the git-annex branch.

Note that the Merger thread now also forces an update of the git-annex
branch. The assistant was not updating this branch before, and it saw a
(mostly) correct view of state, but now that incoming pushes go to
synced/git-annex, it needs to be merged in.
2012-09-17 21:05:50 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo
ba35a10a1e Added a comment 2012-09-18 00:11:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo
1778fa3a79 Added a comment 2012-09-17 23:00:10 +00:00
93.218.139.22
714cf46171 poll vote (My phone (or MP3 player)) 2012-09-17 19:01:43 +00:00
Joey Hess
1e37c0c5fc note 2012-09-17 13:43:08 -04:00
174.127.226.162
a4c062151d poll vote (Google Drive) 2012-09-17 17:36:16 +00:00
http://joeyh.name/
1939093e73 Added a comment 2012-09-17 15:32:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
5d4b1bd868 Added a comment 2012-09-17 14:12:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnq-RfkVpFN15SWvQ2lpSGAi0XpNQuLxKM
641c4cef0d 2012-09-17 12:49:44 +00:00
Joey Hess
2081a31fda Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-16 20:14:13 -04:00
Joey Hess
cead5d056e blog for the day 2012-09-16 20:13:32 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo
62da26d4c8 Added a comment 2012-09-16 22:51:00 +00:00
Joey Hess
601ee470af sync: Pushes the git-annex branch to remote/synced/git-annex, rather than directly to remote/git-annex.
This fixes a problem I was seeing in the assistant where two remotes would
attempt to sync with one another at the same time, and both failed pushing
the diverged git-annex branch. Then when both tried to resolve the failed
push, they each modified their git-annex branch, which again each blocked
the other from pushing into it. The result was that the git-annex
branches were perpetually diverged (despite having the same content!) and
once the assistant fell into this trap, it couldn't get out and always
had to do the slow push/fail/pull/merge/push/fail cycle.
2012-09-16 17:54:12 -04:00
http://meep.pl/
1ea5f13230 poll vote (Tahoe-LAFS) 2012-09-16 19:48:51 +00:00
Joey Hess
e61512f42d fix 2012-09-16 13:13:17 -04:00
Joey Hess
ebdc8422db Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-16 13:11:47 -04:00
Joey Hess
a5230cce7c fix display of only blog posts tagged polls 2012-09-16 13:11:12 -04:00
http://joeyh.name/
2b7fbe7cf6 Added a comment 2012-09-16 17:08:50 +00:00
2001:470:1f04:a19:200b:39d4:308f:4f6c
b3e9a121e0 poll vote (My phone (or MP3 player)) 2012-09-16 16:48:19 +00:00
2001:470:1f04:a19:200b:39d4:308f:4f6c
ce3a5acf9f poll vote (My phone (or MP3 player)) 2012-09-16 16:48:14 +00:00
2001:470:1f04:a19:200b:39d4:308f:4f6c
f8ff6577aa poll vote (My phone (or MP3 player)) 2012-09-16 16:48:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo
10d4b78bf3 Added a comment: thanx for fast help ;) 2012-09-16 16:09:29 +00:00
2001:638:a00:2a:298a:16f8:72b0:85b5
874321692e poll vote (My phone (or MP3 player)) 2012-09-16 15:14:11 +00:00
80.217.244.158
d5897c3cdc poll vote (My phone (or MP3 player)) 2012-09-16 14:53:35 +00:00
98.207.92.124
93f42da0bd poll vote (Amazon S3) 2012-09-16 06:52:00 +00:00
Joey Hess
6d1068f160 retitle 2012-09-16 02:05:55 -04:00
Joey Hess
0b12db64d8 Avoid crashing on encoding errors in filenames when writing transfer info files and reading from checksum commands. 2012-09-16 01:53:06 -04:00
Joey Hess
947b447626 close 2012-09-16 01:20:14 -04:00
Joey Hess
e028845487 close 2012-09-16 01:19:04 -04:00
Joey Hess
48fd1e629c reinject: When the provided file doesn't match, leave it where it is, rather than moving to .git/annex/bad/ 2012-09-16 01:17:48 -04:00
Joey Hess
719d229d9d Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-15 22:41:06 -04:00
Joey Hess
dd9e1f9831 blog for the day 2012-09-15 22:40:21 -04:00
188.61.52.255
d0d9eb1031 poll vote (Amazon Glacier) 2012-09-16 01:17:43 +00:00
188.61.52.255
a404ed33c3 poll vote (Tahoe-LAFS) 2012-09-16 01:17:34 +00:00
188.61.52.255
7e76544945 poll vote (Amazon Glacier) 2012-09-16 01:17:17 +00:00
Joey Hess
9a9b4b840e Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-15 20:17:03 -04:00
http://joeyh.name/
bd91c3f1fe Added a comment 2012-09-16 00:14:50 +00:00
80.187.96.136
816b9b4200 poll vote (Amazon S3) 2012-09-15 20:20:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo
74451f7155 2012-09-15 20:19:40 +00:00
89.236.47.66
83a1d4d496 poll vote (My phone (or MP3 player)) 2012-09-15 20:10:35 +00:00
Joey Hess
b453ea8b48 found some bugs 2012-09-15 15:24:07 -04:00
http://joeyh.name/
2af34358b0 Added a comment 2012-09-15 16:39:19 +00:00
128.61.104.52
0b8fdca494 poll vote (My phone (or MP3 player)) 2012-09-15 15:03:16 +00:00
87.79.135.229
69bdc6207b poll vote (Amazon Glacier) 2012-09-15 13:01:56 +00:00
2001:980:45c4:1:a5a9:c33:f9a:2d05
1c054cd2e6 poll vote (My phone (or MP3 player)) 2012-09-15 12:41:35 +00:00
http://www.dbruhn.de/
1eca8d107e 2012-09-15 10:09:25 +00:00