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

Backport changes from #4385, #4494, #4472 #4523

Merged
merged 9 commits into from Apr 27, 2023
Merged

Backport changes from #4385, #4494, #4472 #4523

merged 9 commits into from Apr 27, 2023
+94 −105

Conversation

coot
Copy link
Contributor

@coot coot commented Apr 24, 2023 •
edited

Checklist

  • Branch
    • Commit sequence broadly makes sense
    • Commits have useful messages
    • New tests are added if needed and existing tests are updated
    • If this branch changes Consensus and has any consequences for downstream repositories or end users, said changes must be documented in interface-CHANGELOG.md
    • If this branch changes Network and has any consequences for downstream repositories or end users, said changes must be documented in interface-CHANGELOG.md
    • If serialization changes, user-facing consequences (e.g. replay from genesis) are confirmed to be intentional.
  • Pull Request
    • Self-reviewed the diff
    • Useful pull request description at least containing the following information:
      • What does this PR change?
      • Why these changes were needed?
      • How does this affect downstream repositories and/or end-users?
      • Which ticket does this PR close (if any)? If it does, is it linked?
    • Reviewer requested

coot and others added 7 commits April 24, 2023 15:50
@coot
peer-state-actions: fixed a typo
a95caa3
@coot
peer-state-actions: use modifyTVar rather than stateTVar
b71b824
@coot
peer-state-actions: removed unused exception
99e6542
@coot
peer-state-actions: rename variables so its less confusing
d26db58
@coot
peer-state-actions: preserve mini-protocol result
83be6d9 
When a hot mini-protocol exits we need to preserve the information why
it did so, otherwise the outbound governor might miss that information
and thus not insert any reactivation delay.
@bolt12 @coot
Fix issue 4491
4cda8c7 
Updates the result local root groups TVar with up to date information
instead of static one.
@bolt12 @coot
Remove single source of truth test
88b83e1 
This test was checking ill defined. Turns out the fix test for this as
well.
@coot coot requested a review from dcoutts April 24, 2023 14:26
karknu and others added 2 commits April 24, 2023 16:30
@karknu @coot
Update chainsync timeout
2da3894 
Increase the minimum timeout from 90s to 135s and switch from picking
from an array of 5 values to a range of timeouts.
This change reduces the risk of synchronosation among nodes in the
network.
@coot
Bump ouroboros-network version to 0.3.0.3
922a5fe
@coot coot changed the title Backport changes from #4385, #4494 Backport changes from #4385, #4494, #4472 Apr 24, 2023
@coot coot requested a review from disassembler April 24, 2023 14:32
@coot
Copy link
Contributor Author

coot commented Apr 26, 2023

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 26, 2023

👎 Rejected by too few approved reviews

dcoutts
dcoutts approved these changes Apr 27, 2023
View reviewed changes
Copy link
Contributor

@dcoutts dcoutts left a comment

Choose a reason for hiding this comment

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

LGTM.

@coot
Copy link
Contributor Author

coot commented Apr 27, 2023

I'll merge without bors to avoid CI, there's no need since the branch is synced with the target branch and it was successful. CI wasn't merciful today to us 😁.

@coot coot merged commit 0c526f6 into release/cardano-node-1.35.x Apr 27, 2023
5 checks passed
@coot coot deleted the coot/release-1.35.8 branch April 27, 2023 14:25
@coot coot added the networking label Jul 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcoutts dcoutts dcoutts approved these changes

@nfrisby nfrisby Awaiting requested review from nfrisby nfrisby is a code owner

@dnadales dnadales Awaiting requested review from dnadales dnadales is a code owner

@disassembler disassembler Awaiting requested review from disassembler

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@coot @dcoutts @bolt12 @karknu