CI: use alternative disks if available #148146
Open
+60
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-CI
the8472
force-pushed
the
ci-use-extra-disk
branch
2 times, most recently
from
b040885 to
4848df3
Compare
This comment has been minimized.
This comment has been minimized.
the8472
force-pushed
the
ci-use-extra-disk
branch
from
4848df3 to
357f10f
Compare
This comment has been minimized.
This comment has been minimized.
the8472
force-pushed
the
ci-use-extra-disk
branch
from
357f10f to
d288956
Compare
This comment has been minimized.
This comment has been minimized.
the8472
force-pushed
the
ci-use-extra-disk
branch
from
d288956 to
014c722
Compare
This comment has been minimized.
This comment has been minimized.
the8472
force-pushed
the
ci-use-extra-disk
branch
from
014c722 to
53b6d43
Compare
rustbot
added
the
S-waiting-on-review
rustbot
removed
the
S-waiting-on-author
|
r? @marcoieni rustbot has assigned @marcoieni. Use |
marcoieni
reviewed
Oct 27, 2025
| # The availability of the disks we're probing isn't guaranteed, | ||
| # so this is opportunistic. | ||
| checkAlternative() { | ||
| local mountpoint="/mnt" |
There was a problem hiding this comment.
I find confusing naming the variable as the mountpoint command
marcoieni
reviewed
Oct 27, 2025
| local mntopts="defaults,discard,journal_async_commit,barrier=0,noauto_da_alloc,lazytime,data=writeback" | ||
|
|
||
| # GHA has a 2nd disk mounted at /mnt that is almost empty | ||
| if mountpoint /mnt && [ "$available_space_kb" -ge "$space_target_kb" ]; then |
There was a problem hiding this comment.
should we reuse the variable instead of hardcoding /mnt?
marcoieni
reviewed
Oct 27, 2025
marcoieni
reviewed
Oct 27, 2025
marcoieni
reviewed
Oct 27, 2025
Comment on lines
265
to
272
| local blkdev=$(df -k "$mountpoint" --output=source | tail -n 1) | ||
| echo "Sufficient space available on $blkdev mounted at $mountpoint" | ||
| sudo swapoff -a || true | ||
| mkdir ./obj | ||
| # remount with O_EATMYDATA while we're at it | ||
| sudo umount /mnt | ||
| sudo mount $blkdev ./obj -o $mntopts || sudo dmesg | tail -n 20 | ||
| sudo chown -R "$USER":"$USER" ./obj |
There was a problem hiding this comment.
can you add more comments explaining what you are doing here? 🙏
|
I have no objections if this works as it seems faster than freeing up disk space 🙌 |
cleaning up disk space takes a lot of time
Co-authored-by: Marco Ieni <11428655+marcoieni@users.noreply.github.com>
the8472
force-pushed
the
ci-use-extra-disk
branch
from
4457feb to
1d7b3f2
Compare
the8472
commented
Oct 27, 2025
| # remount under the obj dir which is used by docker scripts to write most | ||
| # of our build output. And apply optimized mount options while we're at it. | ||
| mkdir ./obj | ||
| sudo mount $blkdev ./obj -o $mntopts || (sudo dmesg | tail -n 20 ; exit 1) |
| printDF "BEFORE CLEAN-UP:" | ||
| echo "" | ||
|
|
||
| checkAlternative |
There was a problem hiding this comment.
and moved this down a bit so we always print the disk space before, useful for later reference in case it was not sufficient.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cleaning up disk space takes a lot of time, sometimes 30 minutes