Skip to content

Fix multi process collision by initializing pid variable in master process #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 3, 2017
Merged

Fix multi process collision by initializing pid variable in master process #192

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5f191a
initialize pid variable in master process
aimestereo Aug 30, 2017
8d5e182
Improve readability
aimestereo Sep 1, 2017
b681e60
Remove long comment
aimestereo Sep 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions prometheus_client/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ def close(self):
def _MultiProcessValue(_pidFunc=os.getpid):
files = {}
values = []
pid = {'value': _pidFunc()}
# Use a single global lock when in multi-processing mode
# as we presume this means there is no threading going on.
# This avoids the need to also have mutexes in __MmapDict.
Expand All @@ -413,22 +414,23 @@ def __init__(self, typ, metric_name, name, labelnames, labelvalues, multiprocess


def __reset(self):
self._pid = _pidFunc()
typ, metric_name, name, labelnames, labelvalues, multiprocess_mode = self._params
if typ == 'gauge':
file_prefix = typ + '_' + multiprocess_mode
else:
file_prefix = typ
if file_prefix not in files:
filename = os.path.join(
os.environ['prometheus_multiproc_dir'], '{0}_{1}.db'.format(file_prefix, self._pid))
os.environ['prometheus_multiproc_dir'], '{0}_{1}.db'.format(file_prefix, pid['value']))
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()
if pid['value'] != actual_pid:
pid['value'] = actual_pid
# There has been a fork(), reset all the values.
for f in files.values():
f.close()
Expand Down