Skip to content

Fix race condition in PluginEventAccumulator.PluginTagToContent() #1235

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
nfelt merged 1 commit into from
Jun 11, 2018
Merged

Fix race condition in PluginEventAccumulator.PluginTagToContent() #1235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions tensorboard/backend/event_processing/plugin_event_accumulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,11 @@ def __init__(self,
# first event encountered per tag, so we must store that first instance of
# content for each tag.
self._plugin_to_tag_to_content = collections.defaultdict(dict)
self._plugin_tag_locks = collections.defaultdict(threading.Lock)

self._generator_mutex = threading.Lock()
self.path = path
self._generator = _GeneratorFromPath(path)
self._generator_mutex = threading.Lock()

self.purge_orphaned_data = purge_orphaned_data

Expand Down Expand Up @@ -238,7 +239,9 @@ def PluginTagToContent(self, plugin_name):
"""
if plugin_name not in self._plugin_to_tag_to_content:
raise KeyError('Plugin %r could not be found.' % plugin_name)
return self._plugin_to_tag_to_content[plugin_name]
with self._plugin_tag_locks[plugin_name]:
# Return a snapshot to avoid concurrent mutation and iteration issues.
return dict(self._plugin_to_tag_to_content[plugin_name])

def SummaryMetadata(self, tag):
"""Given a summary tag name, return the associated metadata object.
Expand Down Expand Up @@ -326,8 +329,9 @@ def _ProcessEvent(self, event):
self.summary_metadata[tag] = value.metadata
plugin_data = value.metadata.plugin_data
if plugin_data.plugin_name:
self._plugin_to_tag_to_content[plugin_data.plugin_name][tag] = (
plugin_data.content)
with self._plugin_tag_locks[plugin_data.plugin_name]:
self._plugin_to_tag_to_content[plugin_data.plugin_name][tag] = (
plugin_data.content)
else:
tf.logging.warn(
('This summary with tag %r is oddly not associated with a '
Expand Down