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

Fixed connections processing await on server shutdown #1153

Merged
merged 3 commits into from
Jul 19, 2023

Conversation

ok-ul-ch
Copy link
Contributor

Fixes #1150

@ok-ul-ch ok-ul-ch requested a review from a team as a code owner July 14, 2023 13:16
Copy link
Member

@niklasad1 niklasad1 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 investing and fixing this issue.

Personally, I have seen something similar when I tried to investigate but never made it this far thank you.

I'm off on vacation for a bit more and I will review it properly when I'm back but I'm not super happy to add this drop-awaiter dependency but maybe not so bad... I saw that you created that library.

@ok-ul-ch ok-ul-ch force-pushed the fix/connections-awaiter-memory-leak branch from adf4daf to b91a214 Compare July 17, 2023 07:58
@ok-ul-ch
Copy link
Contributor Author

Hi, @niklasad1. I've removed separate dependency and used the same idea around tokio's mpsc.

server/src/server.rs Outdated Show resolved Hide resolved
Copy link
Member

@niklasad1 niklasad1 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for removing the dependency

@ok-ul-ch
Copy link
Contributor Author

@niklasad1 pls take a look at failing CI, something odd is happening here. Once I've fixed errors reported by GH actions, it started to fail in Gitlab =)

@jsdw
Copy link
Collaborator

jsdw commented Jul 18, 2023

The failing test looks offhand to be a UI test where the output has changed a bit (possibly owing to the recent rust release); using something like TRYBUILD=overwrite cargo test should lead to the relevant file being updated I think!

@ok-ul-ch
Copy link
Contributor Author

@jsdw this is exactly what I did here.
As I see the issue is that Gitlab and GH checks are using different versions of Rust (1.70 and 1.71 respectively), Most likely, Gitlab CI image needs to be updated but I didn't find the repo where I can udpate it

@jsdw
Copy link
Collaborator

jsdw commented Jul 19, 2023

As I see the issue is that Gitlab and GH checks are using different versions of Rust (1.70 and 1.71 respectively), Most likely, Gitlab CI image needs to be updated but I didn't find the repo where I can udpate it

Aah, ok that makes sense; don't worry about it in that case!

Copy link
Collaborator

@jsdw jsdw left a comment

Choose a reason for hiding this comment

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

Looks like a clean approach to me; nice one!

@jsdw jsdw merged commit f7469b9 into paritytech:master Jul 19, 2023
13 of 14 checks passed
@lexnv lexnv mentioned this pull request Jul 20, 2023
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.

High memory consumption after update from 0.16 to 0.18
3 participants