This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Fix deadlock in http request on hitting tile limit #13858
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
ivovandongen
force-pushed
the
ivd_fix_offline_deadlock
branch
2 times, most recently
from
a21dc7f to
4a97ba5
Compare
pozdnyakov
approved these changes
Feb 12, 2019
| runnable->iter = std::move(iter); | ||
| } | ||
| std::lock_guard<std::mutex> lock(mutex); | ||
| runnables.push_back(runnable); | ||
|
|
||
| wake(); |
There was a problem hiding this comment.
nit: looks wake() does not need locked mutex
LukasPaczos
approved these changes
Feb 12, 2019
ivovandongen
force-pushed
the
ivd_fix_offline_deadlock
branch
from
4a97ba5 to
c71d159
Compare
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.
Fixes #13669
When hitting the tile limit for offline downloads the filesource thread deadlocks. The callback of the http requests triggers the clearing of all outstanding http request (including the one hitting the limit) and then a lock is requested for a second time in the cancel method called from the http request destructor.
In this case, cancel should not request a lock again, but just set the native pointer to 0.