Revert "[siso] Limit remote jobs on Windows to 1000"

This reverts commit 7ababdfe02.

Reason for revert: Max limit 1000 is set inside Siso command now.

Original change's description:
> [siso] Limit remote jobs on Windows to 1000
>
> Until we fix slow Window builds on developer machine,
> It would probably be better to limit remote jobs to 1000.
>
> Bug: b/335525655, b/336481263
> Change-Id: I065e19480a27203da2b32ceb19050d0846fbc554
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5482550
> Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
> Commit-Queue: Junji Watanabe <jwata@google.com>
> Auto-Submit: Junji Watanabe <jwata@google.com>
> Reviewed-by: Fumitoshi Ukai <ukai@google.com>

Bug: b/335525655, b/336481263
Change-Id: I911376d3ef3c7482fad4231db06c0dd1a0f1ab28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5534440
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Junji Watanabe <jwata@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
changes/40/5534440/2
Junji Watanabe 1 year ago committed by LUCI CQ
parent af58dae320
commit 8479869311

@ -9,7 +9,6 @@ Siso/Reclient builds.
# TODO(b/278976196): `siso ninja` command should handle the reclient and
# authentication accordingly.
import multiprocessing
import os
import re
import sys
@ -51,32 +50,19 @@ def main(argv):
"Please run `siso` command directly.",
file=sys.stderr)
return 1
has_remote_jobs = False
for arg in argv:
if arg.startswith("--remote_jobs") or arg.startswith("-remote_jobs"):
has_remote_jobs = True
# Limit -remote_jobs to avoid overloading Reproxy on developer machine.
remote_jobs = None
if not has_remote_jobs and sys.platform == 'win32':
num_cores = multiprocessing.cpu_count()
remote_jobs = min(num_cores * 80, 1000)
os.environ.setdefault("AUTONINJA_BUILD_ID", str(uuid.uuid4()))
with reclient_helper.build_context(argv, 'autosiso') as ret_code:
if ret_code:
return ret_code
cmd = [
argv = [
argv[0],
'ninja',
# Do not authenticate when using Reproxy.
'-project=',
'-reapi_instance=',
]
if remote_jobs:
cmd.append("-remote_jobs=%d" % remote_jobs)
cmd += argv[1:]
return siso.main(cmd)
] + argv[1:]
return siso.main(argv)
if __name__ == '__main__':

Loading…
Cancel
Save