Fix multi process collision by initializing pid variable in master process #192
Conversation
This file contains hidden or 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
brian-brazil
reviewed
Sep 1, 2017
prometheus_client/core.py
Outdated
| @@ -395,6 +395,14 @@ def close(self): | |||
| def _MultiProcessValue(_pidFunc=os.getpid): | |||
| files = {} | |||
| values = [] | |||
|
|
|||
| # 1. use dict instead of nonlocal keyword to support python 2.7 | |||
There was a problem hiding this comment.
This comment isn't adding much to someone familiar with Python, I'd remove it.
prometheus_client/core.py
Outdated
| files[file_prefix] = _MmapedDict(filename) | ||
| self._file = files[file_prefix] | ||
| self._key = json.dumps((metric_name, name, labelnames, labelvalues)) | ||
| self._value = self._file.read_value(self._key) | ||
|
|
||
| def __check_for_pid_change(self): | ||
| if self._pid != _pidFunc(): | ||
| actual_pid = _pidFunc() | ||
|
|
There was a problem hiding this comment.
you can remove this blank line
brian-brazil
reviewed
Sep 2, 2017
prometheus_client/core.py
Outdated
| @@ -395,6 +395,13 @@ def close(self): | |||
| def _MultiProcessValue(_pidFunc=os.getpid): | |||
| files = {} | |||
| values = [] | |||
|
|
|||
| # pid needs to be evaluated here in a master process | |||
There was a problem hiding this comment.
That's usage dependant, not all relevant systems have masters. I think it'll be fine not to have this comment at all.
b3d2f19 to
b681e60
Compare
|
Thanks! |
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.
No description provided.