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

churn no timeouts fix #4959

Merged
merged 1 commit into from
Sep 17, 2024
Merged

Conversation

crocodile-dentist
Copy link
Contributor

@crocodile-dentist crocodile-dentist commented Sep 13, 2024

Description

This was a pain to find.

resolves #4922

Checklist

Quality

  • Commit sequence makes sense and have useful messages, see ref.
  • New tests are added and existing tests are updated.
  • Self-reviewed the PR.

Maintenance

  • Linked an issue or added the PR to the current sprint of ouroboros-network project.
  • Added labels.
  • Updated changelog files.
  • The documentation has been properly updated, see ref.

@crocodile-dentist crocodile-dentist added the churn Issues / PRs related to churn label Sep 13, 2024
@crocodile-dentist crocodile-dentist requested a review from a team as a code owner September 13, 2024 13:54
@crocodile-dentist crocodile-dentist added this pull request to the merge queue Sep 16, 2024
github-merge-queue bot pushed a commit that referenced this pull request Sep 16, 2024
Copy link
Contributor

@coot coot left a comment

Choose a reason for hiding this comment

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

Well done.

Comment on lines +350 to +353
let praosSyncTargets = min 1 (targetNumberOfActiveBigLedgerPeers base)
in case regime of
ChurnBootstrapPraosSync -> praosSync
ChurnPraosSync -> praosSync
ChurnBootstrapPraosSync -> praosSyncTargets
ChurnPraosSync -> praosSyncTargets
Copy link
Contributor

Choose a reason for hiding this comment

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

We use praosSync in other places. Maybe change it in other places as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think I renamed most of those to deadlineTargets as under Praos that's all we have and which is modified by stepping thru the churn loop. Here I decided to keep the praosSync prefix instead of renaming the let binding to deadlineTargets as maybe it would be slightly confusing.

@@ -414,7 +414,7 @@ peerChurnGovernor PeerChurnArgs {
-> HotValency
-> PeerSelectionTargets
-> ModifyPeerSelectionTargets
decreaseKnownBigLedgerPeers _ _ targets base =
Copy link
Contributor

Choose a reason for hiding this comment

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

well spotted

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Sep 16, 2024
@crocodile-dentist crocodile-dentist added this pull request to the merge queue Sep 17, 2024
Merged via the queue into master with commit fce8e60 Sep 17, 2024
13 of 14 checks passed
@crocodile-dentist crocodile-dentist deleted the mwojtowicz/churn-no-timeouts-fix branch September 17, 2024 05:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
churn Issues / PRs related to churn
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Test failure for IOSim.Churn.no timeouts
3 participants