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

Update message pool to include optional context deadline

Browse Source
This commit is contained in:
mcrakhman 2023-05-24 21:47:59 +02:00
parent c485baaadf
commit a5e2bea04c
No known key found for this signature in database
GPG Key ID: DED12CFEF5B8396B
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commonspace/objectsync/msgpool.go
View File

@ -53,9 +53,11 @@ func newMessagePool(peerManager peermanager.PeerManager, messageHandler MessageH
func (s *messagePool) SendSync(ctx context.Context, peerId string, msg *spacesyncproto.ObjectSyncMessage) (reply *spacesyncproto.ObjectSyncMessage, err error) { func (s *messagePool) SendSync(ctx context.Context, peerId string, msg *spacesyncproto.ObjectSyncMessage) (reply *spacesyncproto.ObjectSyncMessage, err error) {
s.updateLastUsage() s.updateLastUsage()
if _, ok := ctx.Deadline(); !ok {
var cancel context.CancelFunc var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, time.Minute) ctx, cancel = context.WithTimeout(ctx, time.Minute)
defer cancel() defer cancel()
}
newCounter := s.counter.Add(1) newCounter := s.counter.Add(1)
msg.RequestId = genReplyKey(peerId, msg.ObjectId, newCounter) msg.RequestId = genReplyKey(peerId, msg.ObjectId, newCounter)
log.InfoCtx(ctx, "mpool sendSync", zap.String("requestId", msg.RequestId)) log.InfoCtx(ctx, "mpool sendSync", zap.String("requestId", msg.RequestId))