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.
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

View file

@ -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. -}