diff options
| author | Benjamin Schubert <contact@benschubert.me> | 2020-01-16 18:49:54 +0000 |
|---|---|---|
| committer | Benjamin Schubert <contact@benschubert.me> | 2020-01-16 18:49:54 +0000 |
| commit | a5b2396539e1621eef75a035b12c1c4266b5c9fe (patch) | |
| tree | 174524d511845a01449ce4be73982f2c0abfafb8 /src/buildstream/_scheduler/queues/fetchqueue.py | |
| parent | b41f5dd977d13937f338d3737733353d613a2245 (diff) | |
| parent | 3554f36185d4ce507fbc76d7a694849ae717d1a8 (diff) | |
| download | buildstream-a5b2396539e1621eef75a035b12c1c4266b5c9fe.tar.gz | |
Merge branch 'bschubert/optimize-consistency' into 'master'
Optimize consistency and state handling
Closes #1126
See merge request BuildStream/buildstream!1739
Diffstat (limited to 'src/buildstream/_scheduler/queues/fetchqueue.py')
| -rw-r--r-- | src/buildstream/_scheduler/queues/fetchqueue.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/buildstream/_scheduler/queues/fetchqueue.py b/src/buildstream/_scheduler/queues/fetchqueue.py index 4f38f377a..18bf392d3 100644 --- a/src/buildstream/_scheduler/queues/fetchqueue.py +++ b/src/buildstream/_scheduler/queues/fetchqueue.py @@ -18,9 +18,6 @@ # Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> # Jürg Billeter <juerg.billeter@codethink.co.uk> -# BuildStream toplevel imports -from ... import Consistency - # Local imports from . import Queue, QueueStatus from ..resources import ResourceType @@ -69,13 +66,7 @@ class FetchQueue(Queue): if status is JobStatus.FAIL: return - element._fetch_done() - - # Successful fetch, we must be CACHED or in the sourcecache - if self._should_fetch_original: - assert element._get_consistency() == Consistency.CACHED - else: - assert element._source_cached() + element._fetch_done(self._should_fetch_original) def register_pending_element(self, element): # Set a "can_query_cache" callback for an element not yet ready |