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.

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

Handle already discarded packets in discard_excess_packets #22594

Merged
merged 1 commit into from Jan 21, 2022

Conversation

sakridge
Copy link
Member

Problem

Packets with .discard() == true are considered as valid by discard_excess_packets, but they have already been dropped as dupes.

Summary of Changes

Don't consider discarded packets

Fixes #

jstarry
jstarry previously approved these changes Jan 20, 2022
Copy link
Member

@jstarry jstarry left a comment

Choose a reason for hiding this comment

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

nice catch

@codecov
Copy link

codecov bot commented Jan 20, 2022

Codecov Report

Merging #22594 (fd17320) into master (6edeed8) will increase coverage by 0.4%.
The diff coverage is 95.6%.

❗ Current head fd17320 differs from pull request most recent head 6c68f66. Consider uploading reports for the commit 6c68f66 to get more accurate results

@@            Coverage Diff            @@
##           master   #22594     +/-   ##
=========================================
+ Coverage    81.1%    81.5%   +0.4%     
=========================================
  Files         560      553      -7     
  Lines      151206   149655   -1551     
=========================================
- Hits       122633   122047    -586     
+ Misses      28573    27608    -965     

@mergify mergify bot dismissed jstarry’s stale review January 20, 2022 17:36

Pull request has been modified.

@sakridge sakridge merged commit 38b02bb into solana-labs:master Jan 21, 2022
@sakridge sakridge deleted the handle-discard branch January 21, 2022 16:22
mergify bot pushed a commit that referenced this pull request Jan 21, 2022
(cherry picked from commit 38b02bb)

# Conflicts:
#	core/src/sigverify_stage.rs
mergify bot pushed a commit that referenced this pull request Jan 21, 2022
sakridge added a commit that referenced this pull request Jan 21, 2022
sakridge added a commit that referenced this pull request Jan 21, 2022
t-nelson pushed a commit that referenced this pull request Jan 21, 2022
mergify bot added a commit that referenced this pull request Jan 22, 2022
…22634)

(cherry picked from commit 38b02bb)

Co-authored-by: sakridge <sakridge@gmail.com>
@jstarry
Copy link
Member

jstarry commented May 3, 2022

@Mergifyio backport v1.9

@mergify
Copy link
Contributor

mergify bot commented May 3, 2022

backport v1.9

✅ Backports have been created

@jstarry
Copy link
Member

jstarry commented May 3, 2022

I just rediscovered this bug on v1.9.. turns out the v1.9 backport was never merged so v1.9 hasn't been running this fix. New PR here: #24926

jstarry added a commit that referenced this pull request May 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants