Close io loop before deleting attribute #27343
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
cro
added a commit
that referenced
this pull request
Sep 24, 2015
Close io loop before deleting attribute
skizunov
added a commit
to skizunov/salt
that referenced
this pull request
Nov 5, 2015
`cls.instance_map` was growing unbounded. This was because `io_loop.close()` was invoked before `stream.close()`. The stategy used to fix this issue was discussed in pull request saltstack#28530 and can be summarized as follows: The `close()` method on the async object will be called if it exists. This will be called before the `io_loop.close()` to give the async object the opportunity to close its stream. The del of the async object will continue to happen after io_loop.close(). This is to maintain the fix from pull request saltstack#27343. Per file change details: salt/utils/async.py: - Implemented the close logic described above. salt/transport/ipc.py: - Ensured that `close()` may be invoked more than once safely. - In IPCServer, `self.stream` was never actually used. Removed references to it to avoid confusion. salt/transport/zeromq.py: - Ensured that `close()` may be invoked more than once safely. salt/transport/tcp.py: - Ensured that `close()` may be invoked more than once safely. - Changed `destroy()` methods to `close()` methods since they involved a stream that should be closed before `io_loop.close()`. - In SaltMessageClient, added more checks for `self._closing`. This makes exit cleaner by not attempting to reconnect while closing. - Removed the code associate with pull request saltstack#28113. This code is no longer needed now that the stream is closed before the io_loop. Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
rallytime
pushed a commit
to rallytime/salt
that referenced
this pull request
Nov 6, 2015
`cls.instance_map` was growing unbounded. This was because `io_loop.close()` was invoked before `stream.close()`. The stategy used to fix this issue was discussed in pull request saltstack#28530 and can be summarized as follows: The `close()` method on the async object will be called if it exists. This will be called before the `io_loop.close()` to give the async object the opportunity to close its stream. The del of the async object will continue to happen after io_loop.close(). This is to maintain the fix from pull request saltstack#27343. Per file change details: salt/utils/async.py: - Implemented the close logic described above. salt/transport/ipc.py: - Ensured that `close()` may be invoked more than once safely. - In IPCServer, `self.stream` was never actually used. Removed references to it to avoid confusion. salt/transport/zeromq.py: - Ensured that `close()` may be invoked more than once safely. salt/transport/tcp.py: - Ensured that `close()` may be invoked more than once safely. - Changed `destroy()` methods to `close()` methods since they involved a stream that should be closed before `io_loop.close()`. - In SaltMessageClient, added more checks for `self._closing`. This makes exit cleaner by not attempting to reconnect while closing. - Removed the code associate with pull request saltstack#28113. This code is no longer needed now that the stream is closed before the io_loop. Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.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.
Fixes #26889