fix p2p permission refresh during load tests

loadtest/im-pressure/agent.go

@@ -259,24 +259,14 @@ func (r *agentRun) reconcileHistory(ctx context.Context, ledger []AcceptedMessag
 	defer cancel()
 	r.issueHistoryQueries(historyCtx, queries)
 	_ = waitContext(historyCtx, 2*time.Second)
-	for round := 0; round < 2; round++ {
+	for {
 		missing := missingHistory(r.recorder, expected)
 		if len(missing) == 0 || historyCtx.Err() != nil {
 			break
 		}
-		retryQueries := make([]historyQuery, 0, len(missing))
-		for _, message := range missing {
-			client := r.clients[message.PeerIndex]
-			if message.Kind == "group" {
-				client = r.clients[1]
-			}
-			if client != nil {
-				retryQueries = append(retryQueries, historyQuery{client: client, topic: message.Topic,
-					since: message.Seq, before: message.Seq + 1, limit: 1})
-			}
-		}
+		retryQueries := r.historyQueriesForMessages(missing)
 		r.issueHistoryQueries(historyCtx, retryQueries)
-		_ = waitContext(historyCtx, 2*time.Second)
+		_ = waitContext(historyCtx, 5*time.Second)
 	}
 	missing := missingHistory(r.recorder, expected)
 	missingIDs := make([]string, 0, len(missing))
@@ -287,6 +277,33 @@ func (r *agentRun) reconcileHistory(ctx context.Context, ledger []AcceptedMessag
 	return len(expected), len(expected) - len(missing), missingIDs
 }
 
+func (r *agentRun) historyQueriesForMessages(messages []AcceptedMessage) []historyQuery {
+	byTopic := make(map[string][]AcceptedMessage)
+	for _, message := range messages {
+		byTopic[message.Topic] = append(byTopic[message.Topic], message)
+	}
+	queries := make([]historyQuery, 0, len(byTopic))
+	for topic, topicMessages := range byTopic {
+		sort.Slice(topicMessages, func(i, j int) bool { return topicMessages[i].Seq < topicMessages[j].Seq })
+		client := r.clients[topicMessages[0].PeerIndex]
+		if topicMessages[0].Kind == "group" {
+			client = r.clients[1]
+		}
+		if client == nil {
+			continue
+		}
+		for start := 0; start < len(topicMessages); start += 200 {
+			end := start + 200
+			if end > len(topicMessages) {
+				end = len(topicMessages)
+			}
+			queries = append(queries, historyQuery{client: client, topic: topic,
+				since: topicMessages[start].Seq, before: topicMessages[end-1].Seq + 1, limit: 256})
+		}
+	}
+	return queries
+}
+
 func (r *agentRun) issueHistoryQueries(ctx context.Context, queries []historyQuery) {
 	workers := r.cfg.HistoryWorkers
 	if workers > len(queries) {