diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-28 16:05:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-28 16:05:34 -0400 |
| commit | c8cd4ec3082ac7dd24c0377d66c95cb05b51f0ba (patch) | |
| tree | d970ff1097f6bf0b0aa5dd371495a2b0932e08e4 /Assistant.hs | |
| parent | fce32440a51e51f53022b4025fa005e52525a100 (diff) | |
ensure that git-annex branch is pushed after a successful transfer
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.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant.hs b/Assistant.hs index 6da565b5e..cf92a8625 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -197,7 +197,7 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do mapM_ (startthread dstatus) [ watch $ commitThread st changechan commitchan transferqueue dstatus #ifdef WITH_WEBAPP - , assist $ webAppThread (Just st) dstatus scanremotes transferqueue transferslots pushnotifier urlrenderer Nothing webappwaiter + , assist $ webAppThread (Just st) dstatus scanremotes transferqueue transferslots pushnotifier commitchan urlrenderer Nothing webappwaiter #ifdef WITH_PAIRING , assist $ pairListenerThread st dstatus scanremotes urlrenderer #endif @@ -207,7 +207,7 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do , assist $ mergeThread st dstatus transferqueue branchhandle , assist $ transferWatcherThread st dstatus transferqueue , assist $ transferPollerThread st dstatus - , assist $ transfererThread st dstatus transferqueue transferslots + , assist $ transfererThread st dstatus transferqueue transferslots commitchan , assist $ daemonStatusThread st dstatus , assist $ sanityCheckerThread st dstatus transferqueue changechan , assist $ mountWatcherThread st dstatus scanremotes pushnotifier |