Fix Arc unwrap function not respecting timeout #4067
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
ffuugoo
reviewed
Apr 18, 2024
lib/collection/src/collection_manager/holders/segment_holder.rs
Outdated
Show resolved
Hide resolved
Co-authored-by: Roman Titov <ffuugoo@users.noreply.github.com>
ffuugoo
reviewed
Apr 18, 2024
Comment on lines
62
to
71
| match Arc::try_unwrap(arc) { | ||
| inner @ Ok(_) => return inner, | ||
| Ok(inner) => return Ok(inner), | ||
| Err(inner) => { | ||
| arc = inner; | ||
| if start.elapsed() >= timeout { | ||
| return Err(arc); | ||
| } | ||
| sleep(spin); | ||
| } | ||
| } |
There was a problem hiding this comment.
Just came up with a better (?) suggestion:
arc = match Arc::try_unwrap(arc) {
Ok(unwrapped) => return Ok(unwrapped),
Err(arc) => arc,
};
if start.elapsed() >= timeout {
return Err(arc);
}
sleep(spin);
ffuugoo
approved these changes
Apr 18, 2024
timvisee
added a commit
that referenced
this pull request
Apr 22, 2024
* Fix Arc unwrap function not respecting timeout * Update lib/collection/src/collection_manager/holders/segment_holder.rs Co-authored-by: Roman Titov <ffuugoo@users.noreply.github.com> * Cleanup `try_unwrap_with_timeout` --------- Co-authored-by: Roman Titov <ffuugoo@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
It appears the
try_unwrap_with_timeoutfunction did not respect the specified timeout.I've changed the implementation to actually check it each iteration. To keep the implementation simple the timeout has a minimum resolution of
spin.All Submissions:
devbranch. Did you create your branch fromdev?New Feature Submissions:
cargo +nightly fmt --allcommand prior to submission?cargo clippy --all --all-featurescommand?