Skip to content

Commit 73a5e9c

Browse files
committed
test: more logs
1 parent 1c39007 commit 73a5e9c

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

cmd/storemsgcounter/execute.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"database/sql"
66
"encoding/hex"
7-
"encoding/json"
87
"errors"
98
"fmt"
109
"net"
@@ -285,10 +284,9 @@ func retrieveHistory(ctx context.Context, runId string, storenodes []peer.AddrIn
285284
var result *store.Result
286285
var err error
287286

288-
logger.Info("retrieving message history for topic", zap.Stringer("storenode", node), zap.Int64("from", startTime.UnixNano()), zap.Int64("to", endTime.UnixNano()))
289-
290287
queryLbl:
291288
for i := 0; i < maxAttempts; i++ {
289+
logger.Info("retrieving message history for topic", zap.Stringer("storenode", node), zap.Int64("from", startTime.UnixNano()), zap.Int64("to", endTime.UnixNano()), zap.Int("attempt", i))
292290
result, err = wakuNode.Store().Query(ctx, store.FilterCriteria{
293291
ContentFilter: protocol.NewContentFilter(topic),
294292
TimeStart: proto.Int64(startTime.UnixNano()),
@@ -345,8 +343,7 @@ func retrieveHistory(ctx context.Context, runId string, storenodes []peer.AddrIn
345343

346344
nextRetryLbl:
347345
for i := 0; i < maxAttempts; i++ {
348-
a, _ := json.Marshal(result.Response())
349-
logger.Info("EXECUTING NEXT!!!", zap.String("cursor", hex.EncodeToString(result.Cursor())), zap.String("RESPONSE", string(a)))
346+
logger.Info("EXECUTING NEXT!!!", zap.String("cursor", hex.EncodeToString(result.Cursor())))
350347
err = result.Next(ctx)
351348
if err != nil {
352349
logger.Error("could not query storenode", zap.Stringer("storenode", node), zap.Error(err))
@@ -392,7 +389,8 @@ func verifyMessageExistence(ctx context.Context, runId string, peerID peer.ID, m
392389

393390
queryLbl:
394391
for i := 0; i < maxAttempts; i++ {
395-
result, err = wakuNode.Store().QueryByHash(ctx, messageHashes, store.IncludeData(false), store.WithPeer(peerInfo.ID))
392+
logger.Info("querying by hash", zap.Stringer("storenode", peerID), zap.Stringers("hashes", messageHashes), zap.Int("attempt", i))
393+
result, err = wakuNode.Store().QueryByHash(ctx, messageHashes, store.IncludeData(false), store.WithPeer(peerInfo.ID), store.WithPaging(false, 100))
396394
if err != nil {
397395
logger.Error("could not query storenode", zap.Stringer("storenode", peerInfo), zap.Error(err))
398396
storeNodeFailure = true
@@ -436,6 +434,7 @@ queryLbl:
436434

437435
nextRetryLbl:
438436
for i := 0; i < maxAttempts; i++ {
437+
logger.Info("executing next while querying hashes", zap.Stringer("storenode", peerID), zap.Int("attempt", i))
439438
err = result.Next(ctx)
440439
if err != nil {
441440
logger.Error("could not query storenode", zap.Stringer("storenode", peerInfo), zap.Error(err))

0 commit comments

Comments
 (0)