Issues/30643 merge forward fixes #31525
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
salt/minion.py: - In the `__master_disconnected` case, it originally set `self.opts['master']` to the result of `self.eval_master`. This makes no sense since `self.eval_master` returns a future. Now we yield on `self.eval_master` and store both return values. - Just like in `Minion.destroy`, we clear `self.pub_channel.on_recv`. Also, if `self.pub_channel` has a `close`, it is invoked. This resolves a circular reference issue with the TCP transport. The `SaltMessageClient` contains function references to the `connect_callback` and `disconnect_callback` functions in `AsyncTCPPubChannel`. This circular reference prevents the `del` from deallocating the `AsyncTCPPubChannel` object. salt/transport/tcp.py: - In `SaltMessageClient.close`, reset the function references `self.connect_callback` and `self.disconnect_callback`. This allows a subsequent `del` on `AsyncTCPPubChannel` to actually deallocate the object. Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
Fork executes finally section triple times.
|
I'll check what's wrong with the tests on Monday. |
|
Sorry, had no time today to check this. Will do tomorrow. |
|
I don't believe the test failures here are related to this PR. Merging. |
cachedout
pushed a commit
that referenced
this pull request
Feb 29, 2016
…fixes Issues/30643 merge forward fixes
|
Thank you! |
2 tasks
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.
What does this PR do?
Merge forward #31512 and #30796 into 2015.8
What issues does this PR fix or reference?
This is for @Ch3LL to check #30643.