mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 18:51:29 +00:00
Reland "Reland "bot_update: remove cleanup_dir""
This reverts commit9801061b06. Reason for revert: disk_usage returns tuple (used_disk_space_gb, total_disk_space_gb, percent_used) so used_disk_space_gb is [0] and percent_used is [2] Original change's description: > Revert "Reland "bot_update: remove cleanup_dir"" > > This reverts commit6cbd7a8243. > > Reason for revert: breaks checkouts with > > ``` > 'tuple' object has no attribute 'used_disk_space_gb' > ``` > > e.g. https://ci.chromium.org/ui/p/infra/builders/try/luci-go-try-mac/b8726181266341916785/overview > > Original change's description: > > Reland "bot_update: remove cleanup_dir" > > > > This reverts commite59e28f1d7. > > > > Reason for revert: Fix up the issue line > > > > Original change's description: > > > Revert "bot_update: remove cleanup_dir" > > > > > > This reverts commit4cebc13a4e. > > > > > > Reason for revert: this breaks Dart's builds > > > https://ci.chromium.org/ui/p/dart/builders/ci.sandbox/dart2js-unit-linux-x64-release/27481/infra > > > > > > Original change's description: > > > > bot_update: remove cleanup_dir > > > > > > > > when git cache is removed, gclient sync fails > > > > and old checkout is moved into cleanup_dir. > > > > > > > > It will cause out of disk error during build > > > > because cleanup_dir keeps full old checkout and build artifacts, > > > > which is no longer needed when bot_update > > > > succeeded to checkout. > > > > > > > > Remove cleanup_dir after checkout. > > > > > > > > Bug: 388307198 > > > > Change-Id: I3858e718622a1ef2012fe5b80a5d9b128d96d1d4 > > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6155955 > > > > Commit-Queue: Jie Sheng <jiesheng@google.com> > > > > Reviewed-by: Yiwei Zhang <yiwzhang@google.com> > > > > Auto-Submit: Fumitoshi Ukai <ukai@google.com> > > > > Owners-Override: Jie Sheng <jiesheng@google.com> > > > > Reviewed-by: Junji Watanabe <jwata@google.com> > > > > Reviewed-by: Jie Sheng <jiesheng@google.com> > > > > > > Bug: 388307198 > > > Change-Id: Ifb68c1aaf28e2203ba2c3b5804c2fd4939bbd921 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6159604 > > > Auto-Submit: Alexander Thomas <athom@google.com> > > > Reviewed-by: Jie Sheng <jiesheng@google.com> > > > Commit-Queue: Yiwei Zhang <yiwzhang@google.com> > > > Reviewed-by: Yiwei Zhang <yiwzhang@google.com> > > > > Bug: 388307198 > > Change-Id: I1c6d922c357943882110233f84111a4cbfb9e7d4 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6158861 > > Commit-Queue: Yiwei Zhang <yiwzhang@google.com> > > Auto-Submit: Jie Sheng <jiesheng@google.com> > > Reviewed-by: Yiwei Zhang <yiwzhang@google.com> > > Bug: 388307198 > Change-Id: Ia49e544ca44593e6b9da923a075fb30f3e08b704 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6166120 > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: Yiwei Zhang <yiwzhang@google.com> > Commit-Queue: Yiwei Zhang <yiwzhang@google.com> > Auto-Submit: Vadim Shtayura <vadimsh@chromium.org> Bug: 388307198 Change-Id: I32473c5285f79875b95ece383d39e3e90aa33c41 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6166240 Commit-Queue: Gavin Mak <gavinmak@google.com> Auto-Submit: Fumitoshi Ukai <ukai@google.com> Reviewed-by: Gavin Mak <gavinmak@google.com>
This commit is contained in:
@@ -16,6 +16,7 @@ import optparse
|
||||
import os
|
||||
import pprint
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
@@ -1142,7 +1143,15 @@ def checkout(options, git_slns, specs, revisions, step_text):
|
||||
properties['git_cache_epoch'] = cache_epoch
|
||||
|
||||
usage = disk_usage()
|
||||
# TODO(ukai): remove cleanup_dir if available disk space is small?
|
||||
# successfully checked out. remove cleanup_dir to get free disk space.
|
||||
if os.path.exists(options.cleanup_dir):
|
||||
prev_usage = usage
|
||||
print('Removing cleanup_dir %s' % options.cleanup_dir)
|
||||
shutil.rmtree(options.cleanup_dir, ignore_errors=True)
|
||||
usage = disk_usage()
|
||||
print('Release %dGB (%d%%)' %
|
||||
(prev_usage[0] - usage[0], prev_usage[2] - usage[2]))
|
||||
|
||||
step_text = step_text + (' -> [%dGB/%dGB used (%d%%)]' % usage)
|
||||
|
||||
# Tell recipes information such as root, got_revision, etc.
|
||||
|
||||
Reference in New Issue
Block a user