From 3826ef1923a35ef8794f0e3beb0f94f0f40fd9be Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Sep 2017 14:37:20 -0400 Subject: add exporter thread to assistant This is similar to the pusher thread, but a separate thread because git pushes can be done in parallel with exports, and updating a big export should not prevent other git pushes going out in the meantime. The exportThread only runs at most every 30 seconds, since updating an export is more expensive than pushing. This may need to be tuned. Added a separate channel for export commits; the committer records a commit in that channel. Also, reconnectRemotes records a dummy commit, to make the exporter thread wake up and make sure all exports are up-to-date. So, connecting a drive with a directory special remote export will immediately update it, and getting online will automatically update S3 and WebDAV exports. The transfer queue is not involved in exports. Instead, failed exports are retried much like failed pushes. This commit was sponsored by Ewen McNeill. --- Command/Sync.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Command') diff --git a/Command/Sync.hs b/Command/Sync.hs index 3a838c8a9..44948ea74 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -21,6 +21,7 @@ module Command.Sync ( updateBranch, syncBranch, updateSyncBranch, + seekExportContent, ) where import Command @@ -652,7 +653,10 @@ syncFile ebloom rs af k = do {- When a remote has an export-tracking branch, change the export to - follow the current content of the branch. Otherwise, transfer any files - - that were part of an export but are not in the remote yet. -} + - that were part of an export but are not in the remote yet. + - + - Returns True if any file transfers were made. + -} seekExportContent :: [Remote] -> Annex Bool seekExportContent rs = or <$> forM rs go where -- cgit v1.2.3