Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-22322: Don't create backups for current boot #2554

Merged

Conversation

pmtk
Copy link
Member

@pmtk pmtk commented Nov 3, 2023

Adds a check that prevents backup creation for current boot. Existence of such backup would prevent a proper backup (i.e. created on boot, with data compatible with previous boot) from being created (because microshift does not update backups - only creates new ones while deleting previous).

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 3, 2023
Copy link
Contributor

openshift-ci bot commented Nov 3, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Nov 3, 2023
@openshift-ci-robot
Copy link

@pmtk: This pull request references Jira Issue OCPBUGS-22322, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jogeo

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Adds a check that prevents backup creation for current boot. Existence of such backup would prevent a proper backup (i.e. created on boot, with data compatible with previous boot) from being created (because microshift does not update backups - only creates new ones while deleting previous).

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.

@openshift-ci openshift-ci bot requested a review from jogeo November 3, 2023 09:55
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 3, 2023
@pmtk pmtk marked this pull request as ready for review November 3, 2023 10:33
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 3, 2023
@ggiguash
Copy link
Contributor

ggiguash commented Nov 3, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 3, 2023
@pmtk
Copy link
Member Author

pmtk commented Nov 3, 2023

/cherrypick release-4.14

@openshift-cherrypick-robot

@pmtk: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.14

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.

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD e5a0c4e and 2 for PR HEAD ae53c24 in total

@pmtk
Copy link
Member Author

pmtk commented Nov 3, 2023

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 3, 2023
@pmtk pmtk force-pushed the ocpbugs-22322-premature-backups branch from ae53c24 to 8e6a30d Compare November 3, 2023 15:54
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 3, 2023
@pmtk pmtk force-pushed the ocpbugs-22322-premature-backups branch from 8e6a30d to 88ac961 Compare November 3, 2023 15:55
@pmtk
Copy link
Member Author

pmtk commented Nov 3, 2023

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 3, 2023
@@ -86,6 +86,20 @@ func (dm *dataManagement) backup() error {
}
klog.InfoS("Contents of version file", "contents", versionFile)

currentBootID, err := getCurrentBootID()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're no longer doing a backup on every startup, do we still need the boot ID in the backup name, or could we just use the ostree commit ID?

Other than that question, this looks good.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we could get rid of it. Backup's boot ID should be in version file, so it's not like we'd lose any info.
We'd have to change backing up: create new, delete old -> create tmp, rename into place.
Though I don't think we necessarily need to, there's no penalty for having this, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it complicates the backup procedure, I would not touch it.

@pmtk
Copy link
Member Author

pmtk commented Nov 7, 2023

/retest microshift-metal-tests-arm

Copy link
Contributor

openshift-ci bot commented Nov 7, 2023

@pmtk: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test metal-periodic-test
  • /test metal-periodic-test-arm
  • /test microshift-metal-tests
  • /test microshift-metal-tests-arm
  • /test ocp-conformance
  • /test test-srpm
  • /test test-unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test test-rebase

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-microshift-main-microshift-metal-tests
  • pull-ci-openshift-microshift-main-microshift-metal-tests-arm
  • pull-ci-openshift-microshift-main-ocp-conformance
  • pull-ci-openshift-microshift-main-test-unit
  • pull-ci-openshift-microshift-main-verify

In response to this:

/retest microshift-metal-tests-arm

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.

@pmtk
Copy link
Member Author

pmtk commented Nov 7, 2023

/test microshift-metal-tests-arm

@pmtk
Copy link
Member Author

pmtk commented Nov 7, 2023

/retest

Copy link
Contributor

openshift-ci bot commented Nov 7, 2023

@pmtk: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/metal-periodic-test-arm 88ac961 link false /test metal-periodic-test-arm
ci/prow/microshift-metal-tests-arm 88ac961 link false /test microshift-metal-tests-arm

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@ggiguash
Copy link
Contributor

ggiguash commented Nov 8, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 8, 2023
Copy link
Contributor

openshift-ci bot commented Nov 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pmtk

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@pmtk
Copy link
Member Author

pmtk commented Nov 8, 2023

/cherrypick release-4.14

@openshift-cherrypick-robot

@pmtk: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.14

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.

@openshift-merge-bot openshift-merge-bot bot merged commit bbd3c2c into openshift:main Nov 8, 2023
8 checks passed
@openshift-ci-robot
Copy link

@pmtk: Jira Issue OCPBUGS-22322: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-22322 has been moved to the MODIFIED state.

In response to this:

Adds a check that prevents backup creation for current boot. Existence of such backup would prevent a proper backup (i.e. created on boot, with data compatible with previous boot) from being created (because microshift does not update backups - only creates new ones while deleting previous).

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.

@openshift-cherrypick-robot

@pmtk: new pull request created: #2591

In response to this:

/cherrypick release-4.14

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.

@pmtk pmtk deleted the ocpbugs-22322-premature-backups branch December 15, 2023 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants