summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2020-12-14 23:07:42 +0100
committerJürg Billeter <j@bitron.ch>2020-12-14 23:07:42 +0100
commitef74ce71328b3a9e767c399bcbbeaf42ff14c564 (patch)
treef75b3b5e28d2833cc1ad49c014d81a7072d76c0f
parent6614ac4a2acc79510510e630d7c17e7f7b1db020 (diff)
downloadbuildstream-ef74ce71328b3a9e767c399bcbbeaf42ff14c564.tar.gz
fix dynamic plan
-rw-r--r--src/buildstream/_scheduler/queues/pullqueue.py4
-rw-r--r--src/buildstream/_stream.py5
2 files changed, 3 insertions, 6 deletions
diff --git a/src/buildstream/_scheduler/queues/pullqueue.py b/src/buildstream/_scheduler/queues/pullqueue.py
index ecff02cec..9860256a6 100644
--- a/src/buildstream/_scheduler/queues/pullqueue.py
+++ b/src/buildstream/_scheduler/queues/pullqueue.py
@@ -43,10 +43,6 @@ class PullQueue(Queue):
return QueueStatus.SKIP
def done(self, _, element, result, status):
-
- if status is JobStatus.FAIL:
- return
-
element._load_artifact_done()
@staticmethod
diff --git a/src/buildstream/_stream.py b/src/buildstream/_stream.py
index 7779d99e3..d568cc624 100644
--- a/src/buildstream/_stream.py
+++ b/src/buildstream/_stream.py
@@ -173,12 +173,13 @@ class Stream:
# elements (list of Element): The elements to check
#
def query_cache(self, elements):
- with self._context.messenger.timed_activity("Query cache", silent_nested=True):
+ # with self._context.messenger.timed_activity("Query cache", silent_nested=True):
+ if True:
# Enqueue complete build plan as this is required to determine `buildable` status.
plan = self._pipeline.plan(elements)
self._scheduler.clear_queues()
- self._add_queue(CacheQueryQueue(self._scheduler))
+ self._add_queue(CacheQueryQueue(self._scheduler), track=True) # FIXME rename `track`
self._enqueue_plan(plan)
self._run()