Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

retry only if processing completed for a packet #1393

Merged
merged 6 commits into from
Feb 1, 2024
Merged

retry only if processing completed for a packet #1393

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f761d1
retry only if processing completed for a packet
agouin Feb 1, 2024
13d1549
nil safety
agouin Feb 1, 2024
249efaa
keep assembled and lastProcessedHeight
agouin Feb 1, 2024
a782141
Merge branch 'main' into andrew/retry_only_after_processing
agouin Feb 1, 2024
8b7184b
use counterparty key for remove packet retention
agouin Feb 1, 2024
7a1f41f
Use channel for finishedProcessing
agouin Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 30 additions & 17 deletions relayer/processor/message_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ func (mp *messageProcessor) trackAndSendMessages(

retries := dst.trackProcessingMessage(t)
if t.assembledMsg() == nil {
dst.trackFinishedProcessingMessage(t)
continue
}

Expand Down Expand Up @@ -429,6 +430,9 @@ func (mp *messageProcessor) sendBatchMessages(
dst.log.Debug("Will relay messages", fields...)

callback := func(_ *provider.RelayerTxResponse, err error) {
for _, t := range batch {
dst.trackFinishedProcessingMessage(t)
}
// only increment metrics counts for successful packets
if err != nil || mp.metrics == nil {
return
Expand Down Expand Up @@ -466,6 +470,9 @@ func (mp *messageProcessor) sendBatchMessages(
}

if err := dst.chainProvider.SendMessagesToMempool(broadcastCtx, msgs, mp.memo, ctx, callbacks); err != nil {
for _, t := range batch {
dst.trackFinishedProcessingMessage(t)
}
errFields := []zapcore.Field{
zap.String("path_name", src.info.PathName),
zap.String("src_chain_id", src.info.ChainID),
Expand Down Expand Up @@ -510,26 +517,31 @@ func (mp *messageProcessor) sendSingleMessage(

// Set callback for packet messages so that we increment prometheus metrics on successful relays.
callbacks := []func(rtr *provider.RelayerTxResponse, err error){}
if t, ok := tracker.(packetMessageToTrack); ok {
callback := func(_ *provider.RelayerTxResponse, err error) {
// only increment metrics counts for successful packets
if err != nil || mp.metrics == nil {
return
}
var channel, port string
if t.msg.eventType == chantypes.EventTypeRecvPacket {
channel = t.msg.info.DestChannel
port = t.msg.info.DestPort
} else {
channel = t.msg.info.SourceChannel
port = t.msg.info.SourcePort
}
mp.metrics.IncPacketsRelayed(dst.info.PathName, dst.info.ChainID, channel, port, t.msg.eventType)
}

callbacks = append(callbacks, callback)
callback := func(_ *provider.RelayerTxResponse, err error) {
dst.trackFinishedProcessingMessage(tracker)

t, ok := tracker.(packetMessageToTrack)
if !ok {
return
}
// only increment metrics counts for successful packets
if err != nil || mp.metrics == nil {
return
}
var channel, port string
if t.msg.eventType == chantypes.EventTypeRecvPacket {
channel = t.msg.info.DestChannel
port = t.msg.info.DestPort
} else {
channel = t.msg.info.SourceChannel
port = t.msg.info.SourcePort
}
mp.metrics.IncPacketsRelayed(dst.info.PathName, dst.info.ChainID, channel, port, t.msg.eventType)
}

callbacks = append(callbacks, callback)

//During testing, this adds a callback so our test case can inspect the TX results
if PathProcMessageCollector != nil {
testCallback := func(rtr *provider.RelayerTxResponse, err error) {
Expand All @@ -546,6 +558,7 @@ func (mp *messageProcessor) sendSingleMessage(

err := dst.chainProvider.SendMessagesToMempool(broadcastCtx, msgs, mp.memo, ctx, callbacks)
if err != nil {
dst.trackFinishedProcessingMessage(tracker)
errFields := []zapcore.Field{
zap.String("path_name", src.info.PathName),
zap.String("src_chain_id", src.info.ChainID),
Expand Down
Loading
Loading