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

Fix dns re-initialisation on Windows #3970

Merged
merged 7 commits into from
Aug 23, 2022
Merged

Fix dns re-initialisation on Windows #3970

merged 7 commits into from
Aug 23, 2022

Conversation

coot
Copy link
Contributor

@coot coot commented Aug 19, 2022 •
edited
Loading

Description

Fixes #3968 and refactors resolverResource and asyncResolverResource functions.

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 coot added DNS Issues / PRs related to DNS networking labels Aug 19, 2022
@coot coot requested a review from bolt12 August 19, 2022 17:11
@coot coot force-pushed the coot/dns-reinitialisation-windows branch from a2bb026 to 9f6f2d6 Compare August 19, 2022 17:43
@coot coot marked this pull request as draft August 19, 2022 17:48
@coot coot force-pushed the coot/dns-reinitialisation-windows branch 2 times, most recently from f51c289 to 2fcdb5e Compare August 20, 2022 06:58
@coot coot marked this pull request as ready for review August 20, 2022 07:00
@coot coot force-pushed the coot/dns-reinitialisation-windows branch from 2fcdb5e to e3e8f60 Compare August 20, 2022 07:17
bolt12
bolt12 approved these changes Aug 22, 2022
View reviewed changes
Copy link
Contributor

@bolt12 bolt12 left a comment

Choose a reason for hiding this comment

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

LGTM just a minor comment about commit squashing and lift use

ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS/DNSActions.hs Outdated Show resolved Hide resolved
ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS/DNSActions.hs Outdated Show resolved Hide resolved
@coot coot force-pushed the coot/dns-reinitialisation-windows branch 2 times, most recently from 62d3240 to cd658f7 Compare August 22, 2022 16:45
@coot
Reinitialise dns library
89cfb74 
On Windows, we cannot check modification time of the `/etc/resolv.conf`
file.  Instead we reinitialise the dns library every 60seconds.
@coot
asyncResolverResource: use resolverResource on Windows
f69a428 
This will allow us to cache the dns configuration for 60seconds.
@coot
dns-actions: fixed a typo
4345f72
@coot
dns-actions: provide getResolver function
9bb37ba
@coot
dns-actions: make internal loops tail recursive
dac61e7
@coot
Fixed stylish-haskell parsing error
6c86233
@coot coot force-pushed the coot/dns-reinitialisation-windows branch from cd658f7 to 6c86233 Compare August 22, 2022 17:08
@coot coot force-pushed the coot/dns-reinitialisation-windows branch from 3c1eb9c to bafe3a3 Compare August 22, 2022 18:44
@coot
Rebuild storage-test component
aa211b8 
Added a counter to trigger rebuild of
`ouroboros-consensus-test:storage-test` component.
@coot coot force-pushed the coot/dns-reinitialisation-windows branch from bafe3a3 to aa211b8 Compare August 22, 2022 18:56
@coot
Copy link
Contributor Author

coot commented Aug 23, 2022

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 23, 2022

Build succeeded:

@iohk-bors iohk-bors bot merged commit d6df5ba into master Aug 23, 2022
@iohk-bors iohk-bors bot deleted the coot/dns-reinitialisation-windows branch August 23, 2022 08:25
This was referenced Oct 27, 2022
Closed
Merged
iohk-bors bot added a commit that referenced this pull request Nov 9, 2022
@iohk-bors @mtullsen @coot
Merge #4120
e933084 
4120: Cherry picked network changes for cardano-node-1.35.5 release r=coot a=coot

This cherry-picked patches from the following PRs:

* #3794
* #3844
* #3785
* #3904
* #3915
* #3852
* #3970
* #3979
* #4015
* #4067
* #4004
* #4086
* #4113
* #4106
* #4127
* #4103

Also cherry-picked almost all the commits which modify GitHub actions:
* 18c5244 Run GitHub Actions on pull requests   
* 3adf5a9 Use newer version of io-sim           
* ee9b7a6 Fix GH Actions Windows CI: switch from pkgconf to pkg-config 
* e6cf074 github-actions: use `ubuntu-latest`   
* 9a8b959 Updated versions of github actions    
* fc8f8f0 Fix GH Actions Windows CI caching     
* 7f07c40 Windows Github Actions now use MSYS2  
* b21a7ce Fix chocolatey CI error
* #4134               

TODO:

* [x] bump versions of packages
* [x] input-output-hk/cardano-haskell-packages#84

Co-authored-by: Mark Tullsen <[email protected]>
Co-authored-by: Marcin Szamotulski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bolt12 bolt12 bolt12 approved these changes

@nfrisby nfrisby Awaiting requested review from nfrisby

@dnadales dnadales Awaiting requested review from dnadales

Assignees
No one assigned
Labels
DNS Issues / PRs related to DNS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DNS library errors on Windows
2 participants
@coot @bolt12