fix_: limit the maximum number of message hashes by query hash

wakuv2/missing_messages.go

@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"slices"
+	"sync"
 	"time"
 
 	"github.com/libp2p/go-libp2p/core/peer"
@@ -236,14 +237,26 @@ func (w *Waku) fetchMessagesBatch(missingHistoryRequest TopicInterest, batchFrom
 		return nil
 	}
 
+	wg := sync.WaitGroup{}
+	// Split into batches
+	for i := 0; i < len(missingHashes); i += maxHashQueryLength {
+		j := i + maxHashQueryLength
+		if j > len(missingHashes) {
+			j = len(missingHashes)
+		}
+
+		wg.Add(1)
+		go func(messageHashes []pb.MessageHash) {
+			defer wg.Wait()
+
 			result, err = w.storeQueryWithRetry(missingHistoryRequest.ctx, func(ctx context.Context) (*store.Result, error) {
-		return w.node.Store().QueryByHash(ctx, missingHashes, store.WithPeer(missingHistoryRequest.peerID), store.WithPaging(false, 100))
+				return w.node.Store().QueryByHash(ctx, messageHashes, store.WithPeer(missingHistoryRequest.peerID), store.WithPaging(false, maxHashQueryLength))
 			}, logger, "retrieving missing messages")
 			if err != nil {
 				if !errors.Is(err, context.Canceled) {
 					logger.Error("storenode not available", zap.Error(err))
 				}
-		return err
+				return
 			}
 
 			for !result.IsComplete() {
@@ -257,7 +270,8 @@ func (w *Waku) fetchMessagesBatch(missingHistoryRequest TopicInterest, batchFrom
 
 					err = w.OnNewEnvelopes(envelope, common.StoreMessageType, false)
 					if err != nil {
-				return err
+						logger.Error("could not process envelopes", zap.Error(err))
+						return
 					}
 				}
 
@@ -271,9 +285,15 @@ func (w *Waku) fetchMessagesBatch(missingHistoryRequest TopicInterest, batchFrom
 					if !errors.Is(err, context.Canceled) {
 						logger.Error("storenode not available", zap.Error(err))
 					}
-			return err
+					return
 				}
 			}
 
+		}(missingHashes[i:j])
+
+	}
+
+	wg.Wait()
+
 	return nil
 }

wakuv2/waku.go

@@ -84,7 +84,7 @@ const requestTimeout = 30 * time.Second
 const bootnodesQueryBackoffMs = 200
 const bootnodesMaxRetries = 7
 const cacheTTL = 20 * time.Minute
-const maxHashQueryLength = 100
+const maxHashQueryLength = 50
 const hashQueryInterval = 3 * time.Second
 const messageSentPeriod = 3    // in seconds
 const messageExpiredPerid = 10 // in seconds