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

Jump to bottom

break out of infinite retry for submitted ops #1595

Merged
merged 2 commits into from
Nov 1, 2024
Merged

break out of infinite retry for submitted ops #1595

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74c139d
don't retry operations that have conflict error
shorsher Oct 30, 2024
a116123
add message state on conflict error
shorsher Nov 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
5 changes: 5 additions & 0 deletions internal/batch/batch_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,11 @@
}
}
}
conflictErr, conflictTestOk := err.(operations.ConflictError)
if conflictTestOk && conflictErr.IsConflictError() {
// We know that the connector has received our batch, so we shouldn't need to retry
return true, nil
}

Check warning on line 640 in internal/batch/batch_processor.go

View check run for this annotation

Codecov / codecov/patch

internal/batch/batch_processor.go#L638-L640 

Added lines #L638 - L640 were not covered by tests
Copy link
Contributor

@EnriqueL8 EnriqueL8 Nov 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed this is the right approach but we are missing the else section where we update the message state so in the issue the first time EVMConnect call you get EOF and the second time you get a conflict so it never updated that state for the case where it's a pinned batch tx

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to add the message state, thanks for catching.

} else {
if core.IsPinned(payload.Batch.TX.Type) {
payload.addMessageUpdate(payload.Messages, core.MessageStateReady, core.MessageStateSent)
Expand Down
Loading