Keep last version of deployment #1960

r4f4 · 2019-10-28T09:00:37Z

Putting this up for initial review while I try to work on adding tests.
This PR is implementing the solution proposed in coreos/rpm-ostree#1905.

openshift-ci-robot · 2019-10-28T09:00:40Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: r4f4
To complete the pull request process, please assign cgwalters
You can assign the PR to them by writing /assign @cgwalters in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

rh-atomic-bot · 2019-10-28T09:02:16Z

Can one of the admins verify this patch?
I understand the following commands:

bot, add author to whitelist
bot, test pull request
bot, test pull request once

jlebon · 2019-10-28T14:44:32Z

bot, add author to whitelist

src/ostree/ot-admin-builtin-deploy.c

src/libostree/ostree-sysroot.c

src/libostree/ostree-sysroot-deploy.c

src/libostree/ostree-sysroot-upgrader.c

src/libostree/ostree-sysroot.c

src/ostree/ot-admin-builtin-deploy.c

jlebon · 2019-10-28T19:41:52Z

src/ostree/ot-admin-builtin-deploy.c

@@ -173,8 +175,11 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeCommandInvocation *invocat
        return glnx_throw (error, "--stage cannot currently be combined with --retain arguments");
      if (opt_not_as_default)
        return glnx_throw (error, "--stage cannot currently be combined with --not-as-default");
+      OstreeSysrootSimpleWriteDeploymentFlags flags = 0;


We can also handle opt_not_as_default and the other opt_retain_* options too now, right? Shouldn't be too hard, though you don't have to do this in this PR!

Ok, I'll try to do it in a separate PR.

src/libostree/ostree-sysroot-deploy.c

src/libostree/ostree-sysroot.c

cgwalters · 2019-11-08T22:48:18Z

Hmm. Not opposed but this feels a bit like it's crossing into logic that may be better purely in rpm-ostree? On the other hand maybe any future apt/ebuild-ostree tools would want this too.

r4f4 · 2019-11-11T14:14:24Z

Rebased and squashed commits.

r4f4 · 2019-11-11T14:16:09Z

Hmm. Not opposed but this feels a bit like it's crossing into logic that may be better purely in rpm-ostree? On the other hand maybe any future apt/ebuild-ostree tools would want this too.

@jlebon any comments?

jlebon

Sorry for not getting back to this!

Hmm. Not opposed but this feels a bit like it's crossing into logic that may be better purely in rpm-ostree? On the other hand maybe any future apt/ebuild-ostree tools would want this too.

Yeah, I guess this walks a fine line. I can definitely see it belonging in rpm-ostree first before getting upstreamed to ostree once it becomes useful. Though for that, rpm-ostree would have to duplicate a lot of the logic from ostree_sysroot_simple_write_deployment. Also, the version metadata key concept does live here, so it doesn't seem too outlandish either to have this feature here?

src/libostree/ostree-deployment.h

src/libostree/ostree-deployment.c

src/libostree/ostree-sysroot-deploy.c

src/libostree/ostree-deployment.c

tests/installed/destructive/staged-deploy.yml

rh-atomic-bot · 2019-12-09T19:27:46Z

☔ The latest upstream changes (presumably #1981) made this pull request unmergeable. Please resolve the merge conflicts.

src/libostree/ostree-deployment.c

src/libostree/ostree-sysroot-deploy.c

src/libostree/ostree-sysroot.c

jlebon · 2019-12-11T20:13:44Z

I'm using this rpm-ostree patch to test this:

diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c
index e3f5acef..d16ea710 100644
--- a/src/daemon/rpmostree-sysroot-upgrader.c
+++ b/src/daemon/rpmostree-sysroot-upgrader.c
@@ -1380,11 +1380,12 @@ rpmostree_sysroot_upgrader_deploy (RpmOstreeSysrootUpgrader *self,

       g_auto(RpmOstreeProgress) task = { 0, };
       rpmostree_output_task_begin (&task, "Staging deployment");
-      if (!ostree_sysroot_stage_tree (self->sysroot, self->osname,
+      if (!ostree_sysroot_stage_tree_with_flags (self->sysroot, self->osname,
                                       target_revision, origin,
                                       self->cfg_merge_deployment,
                                       self->kargs_strv,
                                       &new_deployment,
+                                      OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PREVIOUS_VERSION,
                                       cancellable, error))
         return FALSE;
     }

So here's how you would test this using cosa (assuming your cosa workdir is at /srv/fcos):

ostree-dir$ make install DESTDIR=/src/fcos/overrides/rootfs
rpm-ostree-dir$ make install DESTDIR=/src/fcos/overrides/rootfs
/srv/fcos$ cosa build
/srv/fcos$ cosa run

Inside the VM, you can do something like this:

$ ostree commit -b tmp --tree=ref=<checksum-of-booted-deployment> --add-metadata-string version=my-version-1
$ rpm-ostree rebase :tmp
<reboot>
$ ostree commit -b tmp --tree=ref=tmp --add-metadata-string version=my-version-2
$ rpm-ostree upgrade
<reboot>
$ rpm-ostree install ltrace

Once you're up and running, you can use make vmsync in rpm-ostree to hack on top of this without having to rebuild FCOS each time (there's a cosa run --ssh-config which spits out an SSH config file you can give to make vmsync).

src/libostree/ostree-deployment.c

src/libostree/ostree-sysroot.c

jlebon · 2020-02-04T19:58:25Z

@r4f4 Could you rebase and squash all the fixups? Will give it a final review and test!

r4f4 · 2020-02-04T20:53:52Z

Rebased and squashed!

jlebon · 2021-04-19T14:16:34Z

Yes, I'm still interested in this! I need to set aside some time to test it out.

r4f4 · 2021-04-19T14:21:17Z

Ok. I'll try to rebase and fix the conflicts.

jlebon

OK cool, this works well for me in both the staging and non-staging paths (after adding the missing bit in ot-admin-builtin-deploy.c).

Here's how you can pretty easily test this locally in a VM:

[root@qemu0 ~]# rpm-ostree status
State: idle
Deployments:
* ostree://fedora:fedora/x86_64/coreos/next
                   Version: 34.20210503.1.1 (2021-05-12T22:57:51Z)
                    Commit: c229af6df100607f73216ecda14dfc3a71e4c7094f4a7cdd260dc97a5c650a3e
              GPGSignature: Valid signature by 8C5BA6990BDB26E19F2A1A801161AE6945719A39
                  Unlocked: development

[root@qemu0 ~]# ostree commit -b previous-version --add-metadata-string=version=34.20210503.1.0 --tree=ref=c229af6df100607f73216ecda14dfc
3a71e4c7094f4a7cdd260dc97a5c650a3e
b6437a1dae3345aa73908bee2fc4606f56e81a338cb4a9082c51042572294534

[root@qemu0 ~]# ostree admin deploy previous-version --not-as-default
Copying /etc changes: 8 modified, 0 removed, 30 added
Bootloader updated; bootconfig swap: yes; bootversion: boot.0.1, deployment count change: 1

[root@qemu0 ~]# ostree commit -b same-version --add-metadata-string=version=34.20210503.1.1 --tree=ref=c229af6df100607f73216ecda14dfc3a71
e4c7094f4a7cdd260dc97a5c650a3e
3478fbc53e070b3d57c86893417329385cd7bc746670d8d2933b93e51b595b02

[root@qemu0 ~]# ostree admin deploy same-version --retain-previous-version
Copying /etc changes: 8 modified, 0 removed, 30 added
Bootloader updated; bootconfig swap: yes; bootversion: boot.1.1, deployment count change: 1
Freed objects: 190 bytes

[root@qemu0 ~]# rpm-ostree status
State: idle
Deployments:
  ostree://same-version
                   Version: 34.20210503.1.1 (2021-05-14T20:11:40Z)
                    Commit: 3478fbc53e070b3d57c86893417329385cd7bc746670d8d2933b93e51b595b02

* ostree://fedora:fedora/x86_64/coreos/next
                   Version: 34.20210503.1.1 (2021-05-12T22:57:51Z)
                    Commit: c229af6df100607f73216ecda14dfc3a71e4c7094f4a7cdd260dc97a5c650a3e
              GPGSignature: Valid signature by 8C5BA6990BDB26E19F2A1A801161AE6945719A39
                  Unlocked: development

  ostree://previous-version
                   Version: 34.20210503.1.0 (2021-05-14T20:11:00Z)
                    Commit: b6437a1dae3345aa73908bee2fc4606f56e81a338cb4a9082c51042572294534

Then you can also test the staging path by nuking the pending deployment (rpm-ostree cleanup -p) and re-deploying, but this time with --stage followed by ostree admin finalize-staged.

In practice at the rpm-ostree level I think we should just omit the flag in the rpm-ostree rebase case, which is like what we're doing here since we're changing branches, but this works to test the change here. (Or maybe even only enable this in the NO_PULL_BASE case to start.)

src/libostree/ostree-deployment.c

src/libostree/ostree-sysroot-deploy.c

src/libostree/ostree-deployment-private.h

src/ostree/ot-admin-builtin-deploy.c

src/libostree/ostree-sysroot-deploy.c

src/libostree/ostree-sysroot.h

tests/kolainst/destructive/staged-deploy.sh

src/ostree/ot-admin-builtin-deploy.c

r4f4 · 2021-05-20T17:22:12Z

@jlebon I think I've addressed all the points and the test is now passing [2021-05-20T17:04:53.378Z] --- PASS: ext.ostree.destructive.staged-deploy.sh (151.61s)

src/libostree/ostree-deployment.c

src/libostree/ostree-sysroot.h

src/libostree/ostree-deployment.c

src/libostree/ostree-sysroot.c

openshift-ci · 2022-04-22T21:29:58Z

@r4f4: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

westurner · 2024-09-14T16:08:56Z

support configuring host to retain more than two deployments coreos/rpm-ostree#577

Signed-off-by: Rafael Fonseca <[email protected]>

Fixes ostreedev#1905 Signed-off-by: Rafael Fonseca <[email protected]>

Signed-off-by: Rafael Fonseca <[email protected]>

r4f4 · 2024-09-19T16:42:17Z

Update: rebased to fix merge conflicts.

Signed-off-by: Rafael Fonseca <[email protected]>

r4f4 · 2024-09-21T16:58:40Z

/retest

openshift-ci · 2024-09-21T16:58:56Z

@r4f4: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

r4f4 · 2024-10-03T11:33:19Z

/assign @jlebon

openshift-ci-robot added the do-not-merge/work-in-progress label Oct 28, 2019

openshift-ci-robot requested review from mwleeds and rfairley October 28, 2019 09:00

openshift-ci-robot added the size/M label Oct 28, 2019

jlebon reviewed Oct 28, 2019

View reviewed changes

openshift-ci-robot added size/L and removed size/M labels Oct 31, 2019

jlebon reviewed Oct 31, 2019

View reviewed changes

r4f4 force-pushed the keep-last-version branch from 6913c9e to 9aa4b00 Compare November 11, 2019 14:13

jlebon reviewed Nov 21, 2019

View reviewed changes

r4f4 force-pushed the keep-last-version branch from 9aa4b00 to 510d10c Compare November 22, 2019 22:25

openshift-ci-robot added the needs-rebase label Dec 9, 2019

jlebon reviewed Dec 11, 2019

View reviewed changes

r4f4 force-pushed the keep-last-version branch from 3860ca4 to eb5d56f Compare December 20, 2019 15:22

openshift-ci-robot removed the needs-rebase label Dec 20, 2019

jlebon reviewed Jan 24, 2020

View reviewed changes

r4f4 force-pushed the keep-last-version branch from eb5d56f to 583f49f Compare January 27, 2020 12:32

jlebon reviewed Feb 4, 2020

View reviewed changes

src/libostree/ostree-sysroot.c Outdated Show resolved Hide resolved

jlebon mentioned this pull request Feb 4, 2020

support configuring host to retain more than two deployments coreos/rpm-ostree#577

Open

r4f4 force-pushed the keep-last-version branch from 95af32c to 1cf889c Compare February 4, 2020 20:52

r4f4 force-pushed the keep-last-version branch from 6f9cd00 to a6a4f78 Compare April 21, 2021 13:29

openshift-ci bot removed the needs-rebase label Apr 21, 2021

r4f4 force-pushed the keep-last-version branch from a6a4f78 to 85b8d81 Compare April 21, 2021 13:46

jlebon reviewed May 14, 2021

View reviewed changes

r4f4 force-pushed the keep-last-version branch 4 times, most recently from 02bf659 to cb32ef0 Compare May 20, 2021 16:39

jlebon reviewed Jul 26, 2021

View reviewed changes

r4f4 force-pushed the keep-last-version branch from cb32ef0 to b811f7e Compare August 2, 2021 15:19

openshift-ci bot added the needs-rebase label Apr 22, 2022

cgwalters removed the size/L label May 2, 2023

r4f4 added 4 commits September 19, 2024 17:30

deployment: add _ostree_deployment_get_version API

032ff42

Signed-off-by: Rafael Fonseca <[email protected]>

Proxy across write deployment flags

2a2c355

Signed-off-by: Rafael Fonseca <[email protected]>

deploy: keep last deployment version during stage

6e4b112

Fixes ostreedev#1905 Signed-off-by: Rafael Fonseca <[email protected]>

admin/deploy: Add new CLI option to retain previous version

7a9341f

Signed-off-by: Rafael Fonseca <[email protected]>

r4f4 force-pushed the keep-last-version branch from b811f7e to 6ba00ae Compare September 19, 2024 15:31

openshift-merge-robot removed the needs-rebase label Sep 19, 2024

tests/staged-deploy: test --keep-previous option

9977597

Signed-off-by: Rafael Fonseca <[email protected]>

r4f4 force-pushed the keep-last-version branch from 6ba00ae to 9977597 Compare September 21, 2024 08:54

openshift-ci bot assigned jlebon Oct 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Keep last version of deployment #1960

Keep last version of deployment #1960

r4f4 commented Oct 28, 2019

openshift-ci-robot commented Oct 28, 2019

rh-atomic-bot commented Oct 28, 2019

jlebon commented Oct 28, 2019

jlebon Oct 28, 2019

r4f4 Nov 1, 2019

cgwalters commented Nov 8, 2019

r4f4 commented Nov 11, 2019

r4f4 commented Nov 11, 2019

jlebon left a comment

rh-atomic-bot commented Dec 9, 2019

jlebon commented Dec 11, 2019 •

edited

Loading

jlebon commented Feb 4, 2020

r4f4 commented Feb 4, 2020

jlebon commented Apr 19, 2021

r4f4 commented Apr 19, 2021

jlebon left a comment •

edited

Loading

r4f4 commented May 20, 2021

openshift-ci bot commented Apr 22, 2022

westurner commented Sep 14, 2024

r4f4 commented Sep 19, 2024

r4f4 commented Sep 21, 2024

openshift-ci bot commented Sep 21, 2024

r4f4 commented Oct 3, 2024

Keep last version of deployment #1960

Are you sure you want to change the base?

Keep last version of deployment #1960

Conversation

r4f4 commented Oct 28, 2019

openshift-ci-robot commented Oct 28, 2019

rh-atomic-bot commented Oct 28, 2019

jlebon commented Oct 28, 2019

jlebon Oct 28, 2019

Choose a reason for hiding this comment

r4f4 Nov 1, 2019

Choose a reason for hiding this comment

cgwalters commented Nov 8, 2019

r4f4 commented Nov 11, 2019

r4f4 commented Nov 11, 2019

jlebon left a comment

Choose a reason for hiding this comment

rh-atomic-bot commented Dec 9, 2019

jlebon commented Dec 11, 2019 • edited Loading

jlebon commented Feb 4, 2020

r4f4 commented Feb 4, 2020

jlebon commented Apr 19, 2021

r4f4 commented Apr 19, 2021

jlebon left a comment • edited Loading

Choose a reason for hiding this comment

r4f4 commented May 20, 2021

openshift-ci bot commented Apr 22, 2022

westurner commented Sep 14, 2024

r4f4 commented Sep 19, 2024

r4f4 commented Sep 21, 2024

openshift-ci bot commented Sep 21, 2024

r4f4 commented Oct 3, 2024

jlebon commented Dec 11, 2019 •

edited

Loading

jlebon left a comment •

edited

Loading