INDY-1274: Fix for logging #675
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: ArtObr <artemobruchnikov@gmail.com>
Signed-off-by: ArtObr <artemobruchnikov@gmail.com>
plenum/server/monitor.py
Outdated
| @@ -55,6 +55,7 @@ def is_ordered_by_all(self): | |||
| def __init__(self, instance_count): | |||
| self.instance_count = instance_count | |||
| self._requests = {} | |||
| self.messaged_reqs = [] | |||
There was a problem hiding this comment.
Isn't it a source of a possible memory leak?
There was a problem hiding this comment.
Yes, i missed this out. Probably we can remove txns, that was unordered for too long.
Signed-off-by: ArtObr <artemobruchnikov@gmail.com>
|
Test this please |
plenum/server/monitor.py
Outdated
| if over_count > 0: | ||
| for i in range(over_count): | ||
| messaged = self._messaged_reqs.popleft() | ||
| logger.info('Consensus for ReqId: {} was not achieved. ' |
There was a problem hiding this comment.
I think it needs to be DEBUG level
Signed-off-by: ArtObr <artemobruchnikov@gmail.com>
plenum/server/monitor.py
Outdated
| else: | ||
| logger.info('Consensus for ReqId: {} was achieved' | ||
| .format(messaged[0])) | ||
| self.requestTracker._messaged_reqs = new_messaged |
There was a problem hiding this comment.
Why do we need to re-create the list every time? Why don't just remove the message from _messaged_reqs if we ordered it here? I think probability that previously unordered request is finally ordered is not so high, so it will be called relatively rare.
plenum/server/monitor.py
Outdated
| self.instance_count = instance_count | ||
| self._requests = {} | ||
| self._messaged_reqs = deque() |
There was a problem hiding this comment.
Please add a comment what _messaged_reqs is or maybe rename it to something like _unordered_req?
Signed-off-by: ArtObr <artemobruchnikov@gmail.com>
Signed-off-by: ArtObr <artemobruchnikov@gmail.com>
Signed-off-by: ArtObr <artemobruchnikov@gmail.com>
|
Test this please |
ashcherbakov
approved these changes
May 16, 2018
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: ArtObr artemobruchnikov@gmail.com