Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Prevent log spam by updating channel error type #22148

Merged
merged 1 commit into from
Dec 28, 2021

Conversation

carllin
Copy link
Contributor

@carllin carllin commented Dec 28, 2021

Problem

#21981 removed the Select channel logic in favor of recv_timeout, so receivers expecting error type for Select are no longer correct

Summary of Changes

Use RecvTimeout errors

Fixes #

Copy link
Contributor

@AshwinSekar AshwinSekar left a comment

Choose a reason for hiding this comment

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

Thanks for the fix!

Copy link
Contributor

@behzadnouri behzadnouri left a comment

Choose a reason for hiding this comment

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

Just to confirm, the other Error::ReadyTimeout in this file is still good, right?
https://github.com/solana-labs/solana/blob/422a09564/core/src/cluster_info_vote_listener.rs#L596

@carllin
Copy link
Contributor Author

carllin commented Dec 28, 2021

hehe yeah, looks like this one is still using the Select logic https://github.com/solana-labs/solana/blob/422a09564/core/src/cluster_info_vote_listener.rs#L652

Did you mean to delete the Select logic here as well?

@behzadnouri
Copy link
Contributor

Did you mean to delete the Select logic here as well?

no, just double checking on Error::ReadyTimeout side.

@codecov
Copy link

codecov bot commented Dec 28, 2021

Codecov Report

Merging #22148 (6d11f0c) into master (e1a0660) will decrease coverage by 0.0%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           master   #22148     +/-   ##
=========================================
- Coverage    81.2%    81.2%   -0.1%     
=========================================
  Files         520      520             
  Lines      145949   145949             
=========================================
- Hits       118534   118533      -1     
- Misses      27415    27416      +1     

@carllin carllin merged commit f061059 into solana-labs:master Dec 28, 2021
mergify bot pushed a commit that referenced this pull request Dec 28, 2021
(cherry picked from commit f061059)
mergify bot added a commit that referenced this pull request Dec 29, 2021
(cherry picked from commit f061059)

Co-authored-by: carllin <[email protected]>
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants