Skip to content

Commit

Permalink
fix error not appearing in logs when it is a cached (repeated) error
Browse files Browse the repository at this point in the history
  • Loading branch information
sduchesneau committed Jan 29, 2025
1 parent 52e2eb7 commit 07966c1
Showing 1 changed file with 18 additions and 16 deletions.
34 changes: 18 additions & 16 deletions service/tier1.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,24 @@ func (s *Tier1Service) Blocks(
}

outputModuleHash := execGraph.ModuleHashes().Get(request.OutputModule)

requestID := fmt.Sprintf("%s:%d:%d:%s:%t:%t:%s",
outputModuleHash,
request.StartBlockNum,
request.StopBlockNum,
request.StartCursor,
request.ProductionMode,
request.FinalBlocksOnly,
strings.Join(request.DebugInitialStoreSnapshotForModules, ","),
)

// s.resolveCursor
if err := s.errorFromRecordedFailure(requestID, request.ProductionMode, request.StartBlockNum, request.StartCursor); err != nil {
fields = append(fields, zap.Error(err), zap.Bool("cached_error", true))
logger.Info("refusing Substreams Blocks request", fields...)
return err
}

ctx = reqctx.WithOutputModuleHash(ctx, outputModuleHash)
fields = append(fields, zap.String("output_module_hash", outputModuleHash))

Expand Down Expand Up @@ -362,22 +380,6 @@ func (s *Tier1Service) Blocks(
}
}()

requestID := fmt.Sprintf("%s:%d:%d:%s:%t:%t:%s",
outputModuleHash,
request.StartBlockNum,
request.StopBlockNum,
request.StartCursor,
request.ProductionMode,
request.FinalBlocksOnly,
strings.Join(request.DebugInitialStoreSnapshotForModules, ","),
)

// s.resolveCursor
if err := s.errorFromRecordedFailure(requestID, request.ProductionMode, request.StartBlockNum, request.StartCursor); err != nil {
logger.Debug("failing fast on known failing request", zap.String("request_id", requestID))
return err
}

// On app shutdown, we cancel the running '.blocks()' command,
// we catch this situation via IsTerminating() to return a special error.
runningContext, cancelRunning := context.WithCancelCause(ctx)
Expand Down

0 comments on commit 07966c1

Please sign in to comment.