summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos Evripiotis <jevripiotis@bloomberg.net>2019-10-22 11:57:33 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-10-22 14:15:01 +0000
commitd1077b64835df008c645d77d7cf635a7251e3a27 (patch)
treee841c80c87e41d305fc75ae4e31b4723f1644564
parent304449aadda4c7c1d4a5b5ea30bdd021cebeb783 (diff)
downloadbuildstream-d1077b64835df008c645d77d7cf635a7251e3a27.tar.gz
cascache: don't need create_cas_usage_monitor now
Now that we don't use mark.in_suprocess in our tests anymore, we don't need to suppress creating _CASCacheUsageMonitor. This was introduced in 9c2bbe3c3871db3a33f81e48987f6d473f97b136
-rw-r--r--src/buildstream/_cas/cascache.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/buildstream/_cas/cascache.py b/src/buildstream/_cas/cascache.py
index 2a2313097..50a83875a 100644
--- a/src/buildstream/_cas/cascache.py
+++ b/src/buildstream/_cas/cascache.py
@@ -113,7 +113,7 @@ class CASCache():
self._casd_process = subprocess.Popen(
casd_args, cwd=path, stdout=logfile_fp, stderr=subprocess.STDOUT)
- self._cache_usage_monitor = _CASCacheUsageMonitor.create_cas_usage_monitor(self)
+ self._cache_usage_monitor = _CASCacheUsageMonitor(self)
else:
self._casd_process = None
@@ -1099,15 +1099,6 @@ class _CASCacheUsage():
# buildbox-casd.
#
class _CASCacheUsageMonitor:
-
- # FIXME: SemaphoreTracker crashes when triggered via spawn and used in
- # tests using fork.
- @classmethod
- def create_cas_usage_monitor(cls, cas):
- if multiprocessing.get_start_method() == 'spawn':
- return None
- return cls(cas)
-
def __init__(self, cas):
self.cas = cas