summaryrefslogtreecommitdiff
path: root/Assistant/Threads/Committer.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-28 16:05:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-28 16:05:34 -0400
commitc8cd4ec3082ac7dd24c0377d66c95cb05b51f0ba (patch)
treed970ff1097f6bf0b0aa5dd371495a2b0932e08e4 /Assistant/Threads/Committer.hs
parentfce32440a51e51f53022b4025fa005e52525a100 (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/Threads/Committer.hs')
-rw-r--r--Assistant/Threads/Committer.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs
index 7c34f7a93..ceb885100 100644
--- a/Assistant/Threads/Committer.hs
+++ b/Assistant/Threads/Committer.hs
@@ -65,7 +65,7 @@ commitThread st changechan commitchan transferqueue dstatus = thread $ do
]
void $ alertWhile dstatus commitAlert $
runThreadState st commitStaged
- recordCommit commitchan (Commit time)
+ recordCommit commitchan
else refill readychanges
else refill changes
where