benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add timeout when waiting in streampool

Browse Source
This commit is contained in:
mcrakhman 2022-10-21 23:50:14 +02:00 committed by Mikhail Iudin
parent a21e27cce5
commit cec48d1c44
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/commonspace/syncservice/streampool.go
View File

@ -16,7 +16,10 @@ import (
var ErrEmptyPeer = errors.New("don't have such a peer")
var ErrStreamClosed = errors.New("stream is already closed")
const maxSimultaneousOperationsPerStream = 10
var maxSimultaneousOperationsPerStream = 10
var syncWaitPeriod = 2 * time.Second
var ErrSyncTimeout = errors.New("too long wait on sync receive")
// StreamPool can be made generic to work with different streams
type StreamPool interface {
@ -79,7 +82,7 @@ func (s *streamPool) SendSync(
s.waitersMx.Lock()
waiter := responseWaiter{
ch: make(chan *spacesyncproto.ObjectSyncMessage),
ch: make(chan *spacesyncproto.ObjectSyncMessage, 1),
}
s.waiters[msg.TrackingId] = waiter
s.waitersMx.Unlock()
@ -88,10 +91,20 @@ func (s *streamPool) SendSync(
if err != nil {
return
}
log.With("trackingId", msg.TrackingId).Debug("waiting for id")
// TODO: limit wait time here and remove the waiter
reply = <-waiter.ch
log.With("trackingId", msg.TrackingId).Debug("finished waiting for id")
delay := time.NewTimer(syncWaitPeriod)
select {
case <-delay.C:
s.waitersMx.Lock()
delete(s.waiters, msg.TrackingId)
s.waitersMx.Unlock()
log.With("trackingId", msg.TrackingId).Error("time elapsed when waiting")
err = ErrSyncTimeout
case reply = <-waiter.ch:
if !delay.Stop() {
<-delay.C
}
}
return
}

2
common/commonspace/syncservice/synchandler.go
View File

@ -90,7 +90,7 @@ func (s *syncHandler) handleHeadUpdate(
if fullRequest != nil {
log.With("senderId", senderId).
With("heads", update.Heads).
With("heads", fullRequest.GetContent().GetFullSyncRequest().Heads).
With("treeId", msg.TreeId).
Debug("sending full sync request")
return s.syncClient.SendAsync([]string{senderId}, fullRequest)