diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-11 15:42:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-11 15:42:03 -0400 |
| commit | 0d21e323e0d095232e347859adaaf2cc2cd71592 (patch) | |
| tree | 6edb70e3e315926f1a226d30e6e12755c94d3d84 /doc/design/assistant/xmpp.mdwn | |
| parent | 2aa6505378c3789da0cf78c784467c67fd9d593c (diff) | |
allow both one push and one receive-pack to run at the same time
Noticed that when pairing, sometimes both sides start to push, and the other
side sends a PushRequest, and the two deadlock, neither doing anything.
(Timeout eventually breaks this.) So, let both run at the same time.
Diffstat (limited to 'doc/design/assistant/xmpp.mdwn')
| -rw-r--r-- | doc/design/assistant/xmpp.mdwn | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn index b01415829..e31a149e7 100644 --- a/doc/design/assistant/xmpp.mdwn +++ b/doc/design/assistant/xmpp.mdwn @@ -11,9 +11,10 @@ who share a repository, that is stored in the [[cloud]]. See <http://git-annex.branchable.com/design/assistant/blog/day_114__xmpp/#comment-aaba579f92cb452caf26ac53071a6788> * Assistant.Sync.manualPull doesn't handle XMPP remotes yet. This is needed to handle getting back in sync after reconnection. -* If a git push over XMPP is underway, and the remote client stops - responding, it currently blocks other git pushes from starting, forever. - Need a timeout.. +* When pairing, sometimes both sides start to push, and the other side + sends a PushRequest, and the two deadlock, neither doing anything. + (Timeout eventually breaks this.) + Maybe should allow one push and one receive-pack at a time? ## design goals |