mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ensure that git-annex branch is pushed after a successful transfer

Browse source 
I now have this topology working:

   assistant ---> {bare repo, special remote} <--- assistant

And, I think, also this one:

        +----------- bare repo --------+
        v                              v
  assistant ---> special remote <--- assistant

While before with assistant <---> assistant connections, both sides got
location info updated after a transfer, in this topology, the bare repo
*might* get its location info updated, but the other assistant has no way to
know that it did. And a special remote doesn't record location info,
so transfers to it won't propigate out location log changes at all.

So, for these to work, after a transfer succeeds, the git-annex branch
needs to be pushed. This is done by recording a synthetic commit has
occurred, which lets the pusher handle pushing out the change (which will
include actually committing any still journalled changes to the git-annex
branch).

Of course, this means rather a lot more syncing action than happened
before. At least the pusher bundles together very close together pushes,
somewhat. Currently it just waits 2 seconds between each push.
This commit is contained in:
Joey Hess 2012-10-28 16:05:34 -04:00
parent 5406416234
commit 4ac2fd0a22
10 changed files with 41 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/Threads/WebApp.hs
View file

@ -33,6 +33,7 @@ import Assistant.ScanRemotes
import Assistant.TransferQueue
import Assistant.TransferSlots
import Assistant.Pushes
import Assistant.Commits
import Utility.WebApp
import Utility.FileMode
import Utility.TempFile
@ -57,11 +58,12 @@ webAppThread
-> TransferQueue
-> TransferSlots
-> PushNotifier
-> CommitChan
-> UrlRenderer
-> Maybe (IO String)
-> Maybe (Url -> FilePath -> IO ())
-> NamedThread
webAppThread mst dstatus scanremotes transferqueue transferslots pushnotifier urlrenderer postfirstrun onstartup = thread $ do
webAppThread mst dstatus scanremotes transferqueue transferslots pushnotifier commitchan urlrenderer postfirstrun onstartup = thread $ do
webapp <- WebApp
<$> pure mst
<*> pure dstatus
@ -69,6 +71,7 @@ webAppThread mst dstatus scanremotes transferqueue transferslots pushnotifier ur
<*> pure transferqueue
<*> pure transferslots
<*> pure pushnotifier
<*> pure commitchan
<*> (pack <$> genRandomToken)
<*> getreldir mst
<*> pure $(embed "static")