Include changes to the container's root file-system in the checkpoint archive#3443
Merged
openshift-merge-robot merged 5 commits intoJul 19, 2019
Merged
Conversation
Collaborator
|
Can one of the admins verify this patch?
|
adrianreber
force-pushed
the
rootfs-changes-migration
branch
4 times, most recently
from
2aea592 to
bdabbc2
Compare
Collaborator
|
☔ The latest upstream changes (presumably #3442) made this pull request unmergeable. Please resolve the merge conflicts. |
adrianreber
force-pushed
the
rootfs-changes-migration
branch
4 times, most recently
from
a39a548 to
e12aa9a
Compare
Member
|
LGTM |
Member
|
Mind holding this until I get back? I want to do a pass over the API stuff
before merge
…On Thu, Jun 27, 2019, 20:37 Brent Baude ***@***.***> wrote:
LGTM
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#3443>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AB3AOCHP557SKIGT66NET3TP4VML3ANCNFSM4H3ZWDVA>
.
|
Member
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
Collaborator
|
☔ The latest upstream changes (presumably #3496) made this pull request unmergeable. Please resolve the merge conflicts. |
openshift-ci-robot
added
the
needs-rebase
The newly added function GetDiffTarStream() mirrors the GetDiff() function. It tries to get the correct layer ID from getLayerID() and it filters out containerMounts from the tarstream. Thus the behavior is the same as GetDiff(), but it returns a tarstream. This also adds the function ApplyDiffTarStream() to apply the tarstream generated by GetDiffTarStream(). These functions are targeted to support container migration with root file-system changes. Signed-off-by: Adrian Reber <areber@redhat.com>
One of the last limitations when migrating a container using Podman's 'podman container checkpoint --export=/path/to/archive.tar.gz' was that it was necessary to manually handle changes to the container's root file-system. The recommendation was to mount everything as --tmpfs where the root file-system was changed. This extends the checkpoint export functionality to also include all changes to the root file-system in the checkpoint archive. The checkpoint archive now includes a tarstream of the result from 'podman diff'. This tarstream will be applied to the restored container before restoring the container. With this any container can now be migrated, even it there are changes to the root file-system. There was some discussion before implementing this to base the root file-system migration on 'podman commit', but it seemed wrong to do a 'podman commit' before the migration as that would change the parent layer the restored container is referencing. Probably not really a problem, but it would have meant that a migrated container will always reference another storage top layer than it used to reference during initial creation. Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
The newly added functionality to include the container's root file-system changes into the checkpoint archive can now be explicitly disabled. Either during checkpoint or during restore. If a container changes a lot of files during its runtime it might be more effective to migrated the root file-system changes in some other way and to not needlessly increase the size of the checkpoint archive. If a checkpoint archive does not contain the root file-system changes information it will automatically be skipped. If the root file-system changes are part of the checkpoint archive it is also possible to tell Podman to ignore these changes. Signed-off-by: Adrian Reber <areber@redhat.com>
adrianreber
force-pushed
the
rootfs-changes-migration
branch
from
e12aa9a to
875cafb
Compare
openshift-ci-robot
removed
the
needs-rebase
This adds three tests for the --ignore-rootfs option to verify that it works in all combination. 1. Not used at all 2. Only used during restore 3. Only used during checkpoint Signed-off-by: Adrian Reber <areber@redhat.com>
adrianreber
force-pushed
the
rootfs-changes-migration
branch
from
875cafb to
c70657a
Compare
Collaborator
Author
|
Rebased and all tests are green. Can the hold be removed? |
Member
|
/hold cancel Will review today or tomorrow |
openshift-ci-robot
removed
the
do-not-merge/hold
Collaborator
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: adrianreber, mheon 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 |
openshift-ci-robot
added
the
approved
Collaborator
Author
|
@mheon I see that you are really busy with many other PRs, so this is just a friendly ping if you have a chance to look at this. |
Member
|
/lgtm |
github-actions
Bot
added
the
locked - please file new issue/PR
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 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.
One limitation of Podman's container migration feature was that it was problematic to migrate containers which changed their root file-system. The recommendation until now was to mount all directories which the container potentially changes with
--tmpfs. Everything in a--tmpfswas already included in the checkpoint archive.To make it easier for the users to migrate a container, without first mounting all directories with possible changes with
--tmpfs, this now adds container root file-system changes to the checkpoint archive.To extract the changes to the container's root file-system the functionality behind
podman diffis used. There were discussion about usingpodman commit, but that would mean that the restored container is now referencing another storage top layer than it was started with. Usingpodman diffmakes it possible to have the restored container the same as possible as the original container.If the root file-system changes are very large or unnecessary for the container migration there is now a new option for checkpoint and restore called:
--ignore-rootfs. This option tells Podman to not include the root file-system changes in the checkpoint archive during checkpointing, or if they are part of the checkpoint archive to ignore the root file-system changes during restore.