qemu: Unlink non-multipath disks #1393
Closed
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
jlebon
reviewed
Apr 24, 2020
I ran out of space in `/tmp` today and it turned out I had a whole lot of `/tmp/mantle-qemu` files, including some really big disk images. This is a combination of changes from coreos#1338 and the multipath PR coreos#1296 Basically if we get interrupted by Ctrl-C which is a lot more likely now when qemu isn't owning the serial console from the start, we will leak our tmpfiles. We probably need to install a `SIGINT` handler but that's a whole mess that's avoided if we just let the kernel clean up our resources for us, which is what was happening before the multipath PR (well, at least for files and not the swtpm tmpdir, but that's small). And actually coreos#1380 does install a `SIGINT` handler so someone please review that and we can maybe fix this more after that lands.
cgwalters
force-pushed
the
qemu-space-leak
branch
from
ed5df80 to
c997603
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, darkmuggle The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
💯 |
jlebon
reviewed
Apr 24, 2020
Comment on lines
+774
to
+779
| if !disk.NbdDisk { | ||
| // In the non-multipath/nbd case we can just unlink the disk now | ||
| // and avoid leaking space if we get Ctrl-C'd. | ||
| os.Remove(disk.dstFileName) | ||
| } | ||
| disk.dstFileName = "" |
Member
There was a problem hiding this comment.
Suggested change
| if !disk.NbdDisk { | |
| // In the non-multipath/nbd case we can just unlink the disk now | |
| // and avoid leaking space if we get Ctrl-C'd. | |
| os.Remove(disk.dstFileName) | |
| } | |
| disk.dstFileName = "" | |
| if !disk.NbdDisk { | |
| // In the non-multipath/nbd case we can just unlink the disk now | |
| // and avoid leaking space if we get Ctrl-C'd. | |
| os.Remove(disk.dstFileName) | |
| // and unset so it doesn't get added to the list of tmpFiles in | |
| // `Exec()` | |
| disk.dstFileName = "" | |
| } |
Otherwise I think in the nbd path we end up not cleaning the disk and socket?
Member
Author
There was a problem hiding this comment.
OK yeah, I'm just going to stick everything in a single tempdir.
cgwalters
added a commit
to cgwalters/coreos-assembler
that referenced
this pull request
Apr 24, 2020
We had separate code cleaning up: - disk snapshots - rendered ignition config - swtpm Since the swtpm code was already always making a directory, just generalize that and use it for everything so we only have one directory to remove. Came out of discussion in coreos#1393
Member
Author
openshift-merge-robot
pushed a commit
that referenced
this pull request
Apr 24, 2020
We had separate code cleaning up: - disk snapshots - rendered ignition config - swtpm Since the swtpm code was already always making a directory, just generalize that and use it for everything so we only have one directory to remove. Came out of discussion in #1393
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.
I ran out of space in
/tmptoday and it turned out I hada whole lot of
/tmp/mantle-qemufiles, including somereally big disk images. This is a combination of changes
from #1338
and the multipath PR #1296
Basically if we get interrupted by Ctrl-C which is a lot more
likely now when qemu isn't owning the serial console from the
start, we will leak our tmpfiles.
We probably need to install a
SIGINThandler but that's a wholemess that's avoided if we just let the kernel clean up our
resources for us, which is what was happening before the multipath
PR (well, at least for files and not the swtpm tmpdir, but that's
small).
And actually
#1380
does install a
SIGINThandler so someone please review thatand we can maybe fix this more after that lands.