Skip to content

v1.18: Discard packets statically known to fail (backport of #370)#375

Merged
apfitzge merged 2 commits intov1.18from
mergify/bp/v1.18/pr-370
Mar 21, 2024
Merged

v1.18: Discard packets statically known to fail (backport of #370)#375
apfitzge merged 2 commits intov1.18from
mergify/bp/v1.18/pr-370

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Mar 21, 2024

Problem

  • Can statically determine some transactions will fail execution

Summary of Changes

  • Discard them during receiving

Fixes #


This is an automatic backport of pull request #370 done by [Mergify](https://mergify.com).

* Discard packets statically known to fail

* add test

(cherry picked from commit 5f16932)

# Conflicts:
#	core/src/banking_stage/transaction_scheduler/scheduler_controller.rs
@mergify mergify Bot added the conflicts label Mar 21, 2024
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Mar 21, 2024

Cherry-pick of 5f16932 has failed:

On branch mergify/bp/v1.18/pr-370
Your branch is up to date with 'origin/v1.18'.

You are currently cherry-picking commit 5f1693224e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/src/banking_stage/immutable_deserialized_packet.rs
	modified:   core/src/banking_stage/packet_deserializer.rs
	modified:   core/src/banking_stage/packet_receiver.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/banking_stage/transaction_scheduler/scheduler_controller.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Comment on lines +275 to 276
.receive_packets(recv_timeout, remaining_queue_capacity, |_| true));
saturating_add_assign!(self.timing_metrics.receive_time_us, receive_time_us);
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

there was a merge conflict here due to metric accumulation change in master. see 1fc684b for resolve

Copy link
Copy Markdown

@tao-stones tao-stones left a comment

Choose a reason for hiding this comment

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

lgtm

@apfitzge apfitzge merged commit 27493e5 into v1.18 Mar 21, 2024
@apfitzge apfitzge deleted the mergify/bp/v1.18/pr-370 branch March 21, 2024 22:40
anwayde pushed a commit to firedancer-io/agave that referenced this pull request Jul 23, 2024
…#370) (anza-xyz#375)

* Discard packets statically known to fail (anza-xyz#370)

* Discard packets statically known to fail

* add test

(cherry picked from commit 5f16932)

# Conflicts:
#	core/src/banking_stage/transaction_scheduler/scheduler_controller.rs

* resolve conflicts: old metrics update style

---------

Co-authored-by: Andrew Fitzgerald <apfitzge@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants