Commit graph

5032 commits

Author SHA1 Message Date
Joey Hess
ae52efc673 scan multiple remotes in one pass
The expensive transfer scan now scans a whole set of remotes in one pass.
So at startup, or when network comes up, it will run only once.

Note that this can result in transfers from/to higher cost remotes being
queued before other transfers of other content from/to lower cost remotes.
Before, low cost remotes were scanned first and all their transfers came
first. When multiple transfers are queued for a key, the lower cost ones
are still queued first. However, this could result in transfers from slow
remotes running for a long time while transfers of other data from faster
remotes waits.

I expect to make the transfer queue smarter about ordering
and/or make it allow multiple transfers at a time, which should eliminate
this annoyance. (Also, it was already possible to get into that situation,
for example if the network was up, lots of transfers from slow remotes
might be queued, and then a disk is mounted and its faster transfers have
to wait.)

Also note that this means I don't need to improve the code in
Assistant.Sync that currently checks if any of the reconnected remotes
have diverged, and if so, queues scans of all of them. That had been very
innefficient, but now doesn't matter.
2012-08-26 14:09:02 -04:00
Joey Hess
c9b3b8829d thread safe git-annex index file use 2012-08-24 20:50:39 -04:00
Joey Hess
8de7699f39 add transferkey command
Used by the assistant, rather than copy, this is faster because it avoids
using git ls-files, avoids checking the location log redundantly, and
runs in oneshot mode, avoiding making a commit to the git-annex branch
for every file transferred.
2012-08-24 17:23:58 -04:00
Joey Hess
ab5e409a95 keep track of which remotes have been scanned in process state
Since it turned out to make sense to always scan all remotes on startup,
there's no need to persist the info about which have been scanned.
2012-08-24 15:52:23 -04:00
Joey Hess
0b1015370b fix priority inversion
low cost ==> high priority
2012-08-24 13:59:35 -04:00
Joey Hess
a52c552f0b avoid crash when directory doesn't exist 2012-08-24 13:59:24 -04:00
Joey Hess
e58d19b533 run full transfer scan on all remotes at startup
Or when a remote first becomes available after startup.
2012-08-24 13:46:10 -04:00
Joey Hess
9fafddc7eb make higher priorities and full scans be preserved when adding 2012-08-24 13:28:20 -04:00
Joey Hess
72e110ce5d avoid requeueing a download from a remote that no longer has a key 2012-08-24 13:08:38 -04:00
Joey Hess
1f83dafc7e Bugfix: Fix fsck in SHA*E backends, when the key contains composite extensions, as added in 3.20120721. 2012-08-24 12:16:17 -04:00
Joey Hess
cea55b70fc remove slightly misleading extended message 2012-08-23 19:10:20 -04:00
Joey Hess
f3721d89bc also notice dbus unmount events 2012-08-23 18:58:54 -04:00
Joey Hess
4a4f8064ae make the NetWatcher always rescan networked remotes every 30 minutes
There are multiple reasons to do this:

* The local network may be up solid, but a route to a networked remote
  is having trouble. Any transfers to it that fail should be retried.
* Someone might have wicd running, but like to bring up new networks
  by hand too. This way, it'll eventually notice them.
2012-08-23 16:13:43 -04:00
Joey Hess
37b960d3b0 don't rely on hasKeyCheap in the transfer scan
The problem with using it here is that, if a removable drive is scanned
and gets disconnected during the scan, testing for all the files will
indicate it doesn't have them, and the scan is logged as completed
successfully, without necessary transfers being queued.
2012-08-23 15:48:31 -04:00
Joey Hess
6420fa6c08 remove pointless bracket 2012-08-23 15:48:14 -04:00
Joey Hess
715a9a2f8e keep logs of failed transfers, and requeue them when doing a non-full scan
of a remote
2012-08-23 15:24:15 -04:00
Joey Hess
487bdf0e24 add transfer scanned flag files 2012-08-23 13:42:26 -04:00
Joey Hess
ab8cb05989 scan cheapest remotes first
This way, we get transfers from cheapest remotes.
2012-08-23 13:41:38 -04:00
Joey Hess
546ba8b7e1 better name 2012-08-22 15:37:26 -04:00
Joey Hess
5c3e14649e avoid unnecessary transfer scans when syncing a disconnected remote
Found a very cheap way to determine when a disconnected remote has
diverged, and has new content that needs to be transferred: Piggyback on
the git-annex branch update, which already checks for divergence.

However, this does not check if new content has appeared locally while
disconnected, that should be transferred to the remote.

Also, this does not handle cases where the two git repos are in sync,
but their content syncing has not caught up yet.

This code could have its efficiency improved:

* When multiple remotes are synced, if any one has diverged, they're
  all queued for transfer scans.
* The transfer scanner could be told whether the remote has new content,
  the local repo has new content, or both, and could optimise its scan
  accordingly.
2012-08-22 15:05:57 -04:00
Joey Hess
5d577c32a9 move some git operations outside the annex monad to avoid blocking other threads 2012-08-22 14:36:58 -04:00
Joey Hess
68659f4998 refactor 2012-08-22 14:32:17 -04:00
Joey Hess
5a68acb521 add NetWatcher thread
This deals with interruptions in network connectevity, by listening
for a new network interface coming up (using dbus to see when
network-manager or wicd do it), and forcing a rescan of
2012-08-21 19:58:53 -04:00
Joey Hess
e3e8d32924 Merge branch 'master' into assistant 2012-08-21 13:12:38 -04:00
Joey Hess
8f4870c7b6 add amazon glacier 2012-08-21 12:20:51 -04:00
Joey Hess
b8765b30f7 response 2012-08-21 11:59:45 -04:00
Joey Hess
171302db09 Merge remote-tracking branch 'origin/master' 2012-08-21 11:58:26 -04:00
http://joeyh.name/
3b3f5accc8 Added a comment: Justin is right 2012-08-21 15:57:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawla3gLc6_rHuggFfy7o7eGMPvPztFZTrUQ
00d810c300 2012-08-21 13:40:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
d36ea1f66f Added a comment 2012-08-21 12:42:16 +00:00
https://me.yahoo.com/speredenn#aaf38
cbe5a0cfc1 New question 2012-08-21 09:39:27 +00:00
http://dieter-be.myopenid.com/
3aeb371652 Added a comment: better logo? 2012-08-20 21:22:25 +00:00
Joey Hess
68f1be8f0a Merge branch 'master' into assistant
Conflicts:
	Makefile
	debian/copyright
2012-08-20 16:04:56 -04:00
Joey Hess
08db0b9fa3 ignore build-stamp 2012-08-20 16:03:47 -04:00
Joey Hess
db960871fd use a stamp file to avoid running ghc in make install
That fails when make install is run sudoed, but cabal has been used to
install dependencies in a user's home directory.
2012-08-20 16:02:41 -04:00
Joey Hess
0b495e3b81 response 2012-08-20 15:51:03 -04:00
Joey Hess
501071f6b2 Merge branch 'master' of ssh://git-annex.branchable.com 2012-08-20 15:32:01 -04:00
Joey Hess
0d721c8d6d blog for the day 2012-08-20 15:28:37 -04:00
Joey Hess
12165b739b thank rsync.net for providing me with a free account there 2012-08-20 13:53:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlup4hyZo4eCjF8T85vfRXMKBxGj9bMdl0
76b9ca0799 2012-08-20 17:25:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkS6aFVrEwOrDuQBTMXxtGHtueA69NS_jo
0237d77071 removed 2012-08-20 14:44:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkS6aFVrEwOrDuQBTMXxtGHtueA69NS_jo
0a6da4f633 Added a comment: error: unknown option `no-edit' 2012-08-20 14:27:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawla3gLc6_rHuggFfy7o7eGMPvPztFZTrUQ
833fbd8ff2 2012-08-20 11:28:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawla3gLc6_rHuggFfy7o7eGMPvPztFZTrUQ
81cdfe98a6 2012-08-20 10:49:41 +00:00
Joey Hess
c94b21ffd5 add svg versions of the git-annex logo, in color and black and white
This is a simple application of inkscape's rather amazing tracing
capabilities.
2012-08-19 21:18:21 -04:00
Joey Hess
773a06fce6 updates 2012-08-19 20:18:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlu7K3h7Ry1uDAU_ERYGuqt0LoGNJqGuRo
fb8f75c2d7 Fail to add attachment. 2012-08-18 00:35:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlu7K3h7Ry1uDAU_ERYGuqt0LoGNJqGuRo
45fd6e294a Add description of file name related bug. 2012-08-18 00:31:57 +00:00
http://claimid.com/strager
bc6ba0cbeb Added a comment 2012-08-17 15:59:49 +00:00
Joey Hess
dcd208513d Merge branch 'master' into assistant
Conflicts:
	debian/changelog
2012-08-17 08:22:43 -07:00