fix: pullsync make offer timeout

pkg/puller/puller.go

@@ -29,7 +29,7 @@ const loggerName = "puller"
 
 var errCursorsLength = errors.New("cursors length mismatch")
 
-const DefaultSyncErrorSleepDur = time.Second * 5
+const DefaultSyncErrorSleepDur = time.Second * 30
 
 type Options struct {
 	Bins         uint8

pkg/pullsync/pullstorage/pullstorage_test.go

@@ -111,6 +111,21 @@ func TestIntervalChunks(t *testing.T) {
 	}
 }
 
+func TestIntervalChunksTimeout(t *testing.T) {
+	t.Parallel()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 0)
+	defer cancel()
+	<-ctx.Done()
+
+	ps, _ := newPullStorage(t)
+
+	_, _, err := ps.IntervalChunks(ctx, 0, 0, 0, limit)
+	if !errors.Is(err, context.DeadlineExceeded) {
+		t.Fatal(err)
+	}
+}
+
 // Get some descriptor from the chunk channel, then block for a while
 // then add more chunks to the subscribe pull iterator and make sure the loop
 // exits correctly.

pkg/pullsync/pullsync.go

@@ -50,6 +50,7 @@ var (
 
 const (
 	storagePutTimeout = 5 * time.Second
+	makeOfferTimeout  = 5 * time.Minute
 )
 
 // how many maximum chunks in a batch
@@ -355,6 +356,10 @@ func (s *Syncer) handler(streamCtx context.Context, p p2p.Peer, stream p2p.Strea
 
 // makeOffer tries to assemble an offer for a given requested interval.
 func (s *Syncer) makeOffer(ctx context.Context, rn pb.GetRange) (o *pb.Offer, addrs []swarm.Address, err error) {
+
+	ctx, cancel := context.WithTimeout(ctx, makeOfferTimeout)
+	defer cancel()
+
 	chs, top, err := s.storage.IntervalChunks(ctx, uint8(rn.Bin), rn.From, rn.To, maxPage)
 	if err != nil {
 		return o, nil, err