Skip to content
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

Jump to bottom

Operate on public data under Lock #1956

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Operate on public data under Lock #1956

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
34 changes: 20 additions & 14 deletions src/buildstream/element.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
from functools import partial
from itertools import chain
import string
from threading import Lock
from typing import cast, TYPE_CHECKING, Dict, Iterator, Iterable, List, Optional, Set, Sequence

from pyroaring import BitMap # pylint: disable=no-name-in-module
Expand Down Expand Up @@ -298,6 +299,7 @@ def __init__(

self.__environment: Dict[str, str] = {}
self.__variables: Optional[Variables] = None
self.__public_data_guard = Lock()

if artifact_key:
self.__initialize_from_artifact_key(artifact_key)
Expand Down Expand Up @@ -731,14 +733,15 @@ def get_public_data(self, domain: str) -> "MappingNode[Node]":
called as a part of the :ref:`build phase <core_element_build_phase>`
and never before.
"""
if self.__dynamic_public is None:
self.__load_public_data()
with self.__public_data_guard:
if self.__dynamic_public is None:
self.__load_public_data()

# Disable type-checking since we can't easily tell mypy that
# `self.__dynamic_public` can't be None here.
data = self.__dynamic_public.get_mapping(domain, default=None) # type: ignore
if data is not None:
data = data.clone()
# Disable type-checking since we can't easily tell mypy that
# `self.__dynamic_public` can't be None here.
data = self.__dynamic_public.get_mapping(domain, default=None) # type: ignore
if data is not None:
data = data.clone()

return data

Expand All @@ -754,13 +757,14 @@ def set_public_data(self, domain: str, data: "MappingNode[Node]") -> None:
of the :func:`Element.assemble() <buildstream.element.Element.assemble>`
method.
"""
if self.__dynamic_public is None:
self.__load_public_data()
with self.__public_data_guard:
if self.__dynamic_public is None:
self.__load_public_data()

if data is not None:
data = data.clone()
if data is not None:
data = data.clone()

self.__dynamic_public[domain] = data # type: ignore
self.__dynamic_public[domain] = data # type: ignore

def get_environment(self) -> Dict[str, str]:
"""Fetch the environment suitable for running in the sandbox
Expand Down Expand Up @@ -1674,7 +1678,8 @@ def _assemble(self):

# By default, the dynamic public data is the same as the static public data.
# The plugin's assemble() method may modify this, though.
self.__dynamic_public = self.__public.clone()
with self.__public_data_guard:
self.__dynamic_public = self.__public.clone()

# Call the abstract plugin methods

Expand Down Expand Up @@ -1702,7 +1707,8 @@ def _cache_artifact(self, sandbox, collect):

context = self._get_context()
buildresult = self.__build_result
publicdata = self.__dynamic_public
with self.__public_data_guard:
publicdata = self.__dynamic_public
sandbox_vroot = sandbox.get_virtual_directory()
collectvdir = None
sandbox_build_dir = None
Expand Down
Loading