Fixed race conditions with promises when closing Nodes #1429
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
jcague
approved these changes
Jul 10, 2019
erizoAPI/MediaStream.cc
Outdated
| @@ -56,7 +56,7 @@ MediaStream::MediaStream() : closed_{false}, id_{"undefined"} { | |||
| future_async_ = new uv_async_t; | |||
| uv_async_init(uv_default_loop(), async_stats_, &MediaStream::statsCallback); | |||
| uv_async_init(uv_default_loop(), async_event_, &MediaStream::eventCallback); | |||
| uv_async_init(uv_default_loop(), future_async_, &MediaStream::promiseResolver); | |||
| uv_async_init(uv_default_loop(), future_async_, &MediaStream::closePromiseResolver); | |||
There was a problem hiding this comment.
np: shouldn't we call this close_future_async_?
| `clientId: ${clientId}, streamId: ${node.streamId}`); | ||
| return; | ||
| } | ||
| const remainingConnections = client.maybeCloseConnection(connection.id); |
There was a problem hiding this comment.
heads up: this could result in new issues given that maybeCloseConnection is now async
There was a problem hiding this comment.
I agree, and we will have to test and monitor this. However, having the WebRTCConnection object being destroyed because of maybeCloseConnection while removeStream is potentially still running is also not ideal.
| obj->futures_manager_.cleanResolvedFutures(); | ||
| obj->Ref(); |
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.
Description
This PR fixes two problems with
closeNode:1 - MediaStream close promise was not resolved because the
future_async_was closed as part of the process, now the async will be closed after it notifies the completion of the task2 - When WebRTCConnection is closed as part of closeNode because we're closing the last mediaStream in that connection, we would not resolve the
removeStreampromise. Now we make sure the stream is removed and the promise resolved before checking if we should close the connection[] It needs and includes Unit Tests
Changes in Client or Server public APIs
[] It includes documentation for these changes in
/doc.