From c8cd4ec3082ac7dd24c0377d66c95cb05b51f0ba Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 28 Oct 2012 16:05:34 -0400 Subject: 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. --- Assistant/Threads/ConfigMonitor.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Assistant/Threads/ConfigMonitor.hs') diff --git a/Assistant/Threads/ConfigMonitor.hs b/Assistant/Threads/ConfigMonitor.hs index cfd3ca7d9..7450d5c6b 100644 --- a/Assistant/Threads/ConfigMonitor.hs +++ b/Assistant/Threads/ConfigMonitor.hs @@ -24,7 +24,6 @@ import qualified Git.LsTree as LsTree import qualified Annex.Branch import qualified Annex -import Data.Time.Clock import qualified Data.Set as S thisThread :: ThreadName @@ -56,8 +55,7 @@ configMonitorThread st dstatus branchhandle commitchan = thread $ do reloadConfigs st dstatus changedconfigs {- Record a commit to get this config - change pushed out to remotes. -} - time <- getCurrentTime - recordCommit commitchan (Commit time) + recordCommit commitchan go r new {- Config files, and their checksums. -} -- cgit v1.2.3