This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Fix client not being dropped on shutdown #7695
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It looks like @andresilva signed our Contributor License Agreement. 👍 Many thanks, Parity Technologies CLA Bot |
|
Please test this locally by adding a |
andresilva
added
B0-patch
M4-core ⛓
andresilva
force-pushed
the
fix-shutdown
branch
from
99b316f
to
8af73b3
Compare
Merged
tomusdrw
reviewed
Jan 30, 2018
| @@ -856,6 +848,9 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R | |||
| open_dapp(&cmd.dapps_conf, &cmd.http_conf, &dapp)?; | |||
| } | |||
|
|
|||
| // Create a weak reference to the client so that we can wait on shutdown until it is dropped | |||
There was a problem hiding this comment.
Something wierd with the indentation
parity/run.rs
Outdated
| raise_fd_limit(); | ||
|
|
||
| fn wait<T>(res: Result<((bool, Option<String>), Weak<T>), String>) -> Result<(bool, Option<String>), String> { | ||
| res.map(|r| { |
There was a problem hiding this comment.
You should be able to destructure here:
|(restart, weak_client)| {
...
}
parity/run.rs
Outdated
| fn wait_for_drop<T>(w: Weak<T>) { | ||
| let sleep_duration = Duration::from_secs(1); | ||
| let warn_timeout = Duration::from_secs(30); | ||
| let max_timeout = Duration::from_secs(120); |
There was a problem hiding this comment.
IMHO that's a bit too low (especially on HDD). Can we have like 5minutes here?
parity/run.rs
Outdated
| let mut warned = false; | ||
|
|
||
| loop { | ||
| { |
There was a problem hiding this comment.
Why do we need that additional block?
There was a problem hiding this comment.
If the upgrade is successful is it dropped right away or only at the end of the loop iteration? I just wanted to make sure it was dropped right away (before sleeping).
parity/run.rs
Outdated
| } | ||
| } | ||
|
|
||
| if instant.elapsed() > max_timeout { |
There was a problem hiding this comment.
Nitpick. Imho this loop is more concise and cleaner for me (but don't have strong opinion):
while instance.elapsed() < max_timeout {
if w.upgrade().is_none() {
return;
}
if !warned && instant.elapsed() > warn_timeout {
warned = true;
warn!(...);
}
}
warn('unclean');
tomusdrw
added
A6-mustntgrumble 💦
tomusdrw
approved these changes
Jan 30, 2018
svyatonik
added
A0-pleasereview 🤓
|
My two cents: tested it for some time (by adding |
5chdn
added
A8-looksgood 🦄
andresilva
added a commit
that referenced
this pull request
Jan 31, 2018
* parity: wait for client to drop on shutdown * parity: fix grumbles in shutdown wait * parity: increase shutdown timeouts
Merged
andresilva
added a commit
that referenced
this pull request
Jan 31, 2018
* parity: wait for client to drop on shutdown * parity: fix grumbles in shutdown wait * parity: increase shutdown timeouts
Merged
andresilva
added a commit
that referenced
this pull request
Jan 31, 2018
* parity: wait for client to drop on shutdown * parity: fix grumbles in shutdown wait * parity: increase shutdown timeouts
5chdn
pushed a commit
that referenced
this pull request
Jan 31, 2018
* Filter-out nodes.json (#7716) * Filter-out nodes.json * network: sort node table nodes by failure ratio * network: fix node table tests * network: fit node failure percentage into buckets of 5% * network: consider number of attempts in sorting of node table * network: fix node table grumbles * Fix client not being dropped on shutdown (#7695) * parity: wait for client to drop on shutdown * parity: fix grumbles in shutdown wait * parity: increase shutdown timeouts * Wrap --help output to 120 characters (#7626) * Update Clap dependency and remove workarounds * WIP * Remove line breaks in help messages for now * Multiple values can only be separated by commas (closes #7428) * Grumbles; refactor repeating code; add constant * Use a single Wrapper rather than allocate a new one for each call * Wrap --help to 120 characters rather than 100 characters
5chdn
pushed a commit
that referenced
this pull request
Jan 31, 2018
* Filter-out nodes.json (#7716) * Filter-out nodes.json * network: sort node table nodes by failure ratio * network: fix node table tests * network: fit node failure percentage into buckets of 5% * network: consider number of attempts in sorting of node table * network: fix node table grumbles * Fix client not being dropped on shutdown (#7695) * parity: wait for client to drop on shutdown * parity: fix grumbles in shutdown wait * parity: increase shutdown timeouts * Wrap --help output to 120 characters (#7626) * Update Clap dependency and remove workarounds * WIP * Remove line breaks in help messages for now * Multiple values can only be separated by commas (closes #7428) * Grumbles; refactor repeating code; add constant * Use a single Wrapper rather than allocate a new one for each call * Wrap --help to 120 characters rather than 100 characters
This was referenced Feb 14, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I noticed that the
Clientwas not being dropped on shutdown, this also meant that theDatabasewas not dropped and that RocksDB wasn't properly closed. I'm not sure why it's necessary to wait for theClientto drop, maybe there's some other thread holding a reference to it that takes a while to die?I started by converting some stuff to
Weakon the RPC clients and it fixed the issue. And then I implemented the wait mechanism (suggested by @tomusdrw) and I noticed that declaringWeakreferences was no longer necessary.It took me a really long time to figure this out (and incremental compilation really helped). 😐
Should fix #6213, #7518, #7334.