INDY-2164: add re-sending failed msgs for clients #1260
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
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
ashcherbakov
reviewed
Jul 9, 2019
stp_zmq/zstack.py
Outdated
| @@ -130,6 +130,7 @@ def __init__(self, name, ha, basedirpath, msgHandler, restricted=True, | |||
| self._stashed_to_disconnected = {} | |||
| self._stashed_pongs = set() | |||
| self._received_pings = set() | |||
| self._waiting_messages = dict() | |||
There was a problem hiding this comment.
- It's better to use
{}to init a new dict. - How do we limit the number of items in
_waiting_messagesto avoid OOM?
stp_zmq/zstack.py
Outdated
| @@ -802,6 +804,26 @@ def transmit(self, msg, uid, timeout=None, serialized=False): | |||
| return False, err_str | |||
|
|
|||
| def transmitThroughListener(self, msg, ident) -> Tuple[bool, Optional[str]]: | |||
| self._waiting_messages.setdefault(ident, []) | |||
| self._waiting_messages[ident].append(msg) | |||
There was a problem hiding this comment.
You can write self._waiting_messages.setdefault(ident, []).append(msg)
stp_zmq/zstack.py
Outdated
| result, error_msg, need_to_resend = self._transmit_one_msg_through_listener(current_msg, | ||
| ident) | ||
| if not need_to_resend: | ||
| self._waiting_messages[ident].remove(current_msg) |
There was a problem hiding this comment.
Are we going to remove ident from _waiting_messages if there are no more messages there?
stp_zmq/zstack.py
Outdated
| for current_msg in list(self._waiting_messages[ident]): | ||
| result, error_msg, need_to_resend = self._transmit_one_msg_through_listener(current_msg, | ||
| ident) | ||
| if not need_to_resend: |
There was a problem hiding this comment.
Are we going to clear all messages for a given ident after timeout?
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Toktar
changed the title
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
plenum/test/zstack_tests/test_send_client_msgs_with_delay_reqs.py
Outdated
Show resolved
Hide resolved
…nto bug-2164-zmq-sending-fix
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
ashcherbakov
approved these changes
Jul 17, 2019
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.
Signed-off-by: toktar renata.toktar@dsr-corporation.com