summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.avv@gmail.com>2018-08-06 15:57:40 +0000
committerTiago Gomes <tiago.avv@gmail.com>2018-08-06 15:57:40 +0000
commitc4248e22dc6b4f944d083a0da923fe81dc559979 (patch)
treec376b5ccf977b1e28b985dd30dd6725935f8dfe6
parent40ac763a52e6994767c7e789ed40bc71bb5caab8 (diff)
parenta0844cbda721c4d5a5c87b3f213b694c51b14996 (diff)
downloadbuildstream-c4248e22dc6b4f944d083a0da923fe81dc559979.tar.gz
Merge branch 'tiagogomes/issue-550-backport' into 'bst-1.2'
PullQueue: fix resource used See merge request BuildStream/buildstream!612
-rw-r--r--buildstream/_scheduler/queues/pullqueue.py2
-rw-r--r--buildstream/data/userconfig.yaml4
2 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/_scheduler/queues/pullqueue.py b/buildstream/_scheduler/queues/pullqueue.py
index 430afc410..5d732fcf8 100644
--- a/buildstream/_scheduler/queues/pullqueue.py
+++ b/buildstream/_scheduler/queues/pullqueue.py
@@ -29,7 +29,7 @@ class PullQueue(Queue):
action_name = "Pull"
complete_name = "Pulled"
- resources = [ResourceType.UPLOAD]
+ resources = [ResourceType.DOWNLOAD]
def process(self, element):
# returns whether an artifact was downloaded or not
diff --git a/buildstream/data/userconfig.yaml b/buildstream/data/userconfig.yaml
index 6f9f190a1..5f9b01120 100644
--- a/buildstream/data/userconfig.yaml
+++ b/buildstream/data/userconfig.yaml
@@ -35,13 +35,13 @@ cache:
#
scheduler:
- # Maximum number of simultaneous source downloading tasks.
+ # Maximum number of simultaneous downloading tasks.
fetchers: 10
# Maximum number of simultaneous build tasks.
builders: 4
- # Maximum number of simultaneous artifact uploading tasks.
+ # Maximum number of simultaneous uploading tasks.
pushers: 4
# Maximum number of retries for network tasks.