From baff1e6fc13de9b045d4f0b0bf7c6c84e9fedafb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Wed, 26 Oct 2022 21:34:19 +0200 Subject: [PATCH] phase1: workers are running a single build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Worker lock on dl/ is now unnecessary Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 95a6fee..4bd2f0d 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -503,14 +503,12 @@ def MakeEnv(overrides=None, tryccache=False): @properties.renderer def NetLockDl(props, extralock=None): lock = None - locks = [] if props.hasProperty("dl_lock"): lock = NetLocks[props["dl_lock"]] if lock is not None: - locks.append(lock.access('exclusive')) - if extralock is not None: - locks.append(extralock) - return locks + return [lock.access('exclusive')] + else: + return [] @properties.renderer def NetLockUl(props): @@ -547,8 +545,6 @@ def UsignSec2Pub(props): c['builders'] = [] -dlLock = locks.WorkerLock("worker_dl") - workerNames = [ ] for worker in c['workers']: @@ -802,7 +798,7 @@ for target in targets: command = ["make", Interpolate("-j%(prop:nproc:-1)s"), "download", "V=s"], env = MakeEnv(), logEnviron = False, - locks = NetLockDl.withArgs(dlLock.access('exclusive')), + locks = NetLockDl, )) factory.addStep(ShellCommand( -- 2.30.2