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

MCO-595: Remove MCO's pending config workflow #3700

Merged

Conversation

djoshy
Copy link
Contributor

@djoshy djoshy commented May 9, 2023

- What I did
Removed all references/checks for the journal pending config writes. In some cases, I replaced them with desiredConfig checks and in other cases removed them entirely.

- How to verify it
Upgrades tests should work without any new complaints (:

- Description for the changelog
daemon: removed pending config checks

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 9, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented May 9, 2023

@djoshy: This pull request references MCO-595 which is a valid jira issue.

In response to this:

- What I did
Removed all references/checks for the journal pending config writes. In some cases, I replaced them with desiredConfig checks and in other cases removed them entirely.

- How to verify it
Upgrades tests should work without any new complaints (:

- Description for the changelog
daemon: removed pending config checks

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 added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 9, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 9, 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

@djoshy
Copy link
Contributor Author

djoshy commented May 9, 2023

/test unit
/test verify

@djoshy
Copy link
Contributor Author

djoshy commented May 9, 2023

/test e2e-aws-ovn-upgrade

@yuqi-zhang
Copy link
Contributor

/test e2e-gcp-op

@djoshy djoshy force-pushed the remove-journal-pending-config branch from 92fb3aa to db80178 Compare May 9, 2023 20:11
@djoshy
Copy link
Contributor Author

djoshy commented May 9, 2023

/test unit
/test verify
/test e2e-gcp-op

@djoshy
Copy link
Contributor Author

djoshy commented May 10, 2023

/test e2e-gcp-op

1 similar comment
@djoshy
Copy link
Contributor Author

djoshy commented May 10, 2023

/test e2e-gcp-op

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 11, 2023
@djoshy djoshy force-pushed the remove-journal-pending-config branch from db80178 to 124a9f9 Compare May 11, 2023 14:15
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 11, 2023
@djoshy
Copy link
Contributor Author

djoshy commented May 11, 2023

/test e2e-gcp-op

2 similar comments
@djoshy
Copy link
Contributor Author

djoshy commented May 17, 2023

/test e2e-gcp-op

@djoshy
Copy link
Contributor Author

djoshy commented May 17, 2023

/test e2e-gcp-op

@cgwalters
Copy link
Member

There's a lot of subtlety here. I love the goal. The current logic is immensely confusing and hard to understand. (This strongly relates to #1190 )

That said, IIRC the idea with "pending config" is to be a "transient state" between "current" and "desired". I don't see how we can entirely remove that...it seems to me that we at least need a single bit of state that says "we're trying to transition to the desired config"?

@yuqi-zhang
Copy link
Contributor

That said, IIRC the idea with "pending config" is to be a "transient state" between "current" and "desired". I don't see how we can entirely remove that...it seems to me that we at least need a single bit of state that says "we're trying to transition to the desired config"?

So, we do have that already today, done in two ways:

  1. a currentconfig file we write to disk, indicating the transient state
  2. a journal entry (which this is trying to remove)

And when we revisited the workflow, the two did essentially the exact same thing, so there was a duplication of effort, which was fine when things went well, but if anything errored, the journal entry made it exponentially harder to fix if it was e.g. referring to a non-existent hash, even a forcefile did not remove it.

So we wanted to do either or: 1. have the journal or 2. have the file indicate the transient state. We think 2 is easier to manage and less prone to errors + helps remove the MCO's dependency on journal

Hopefully that makes sense, we will try to make sure that what I just described above isn't broken (no regressions due to the removal of this)

@djoshy
Copy link
Contributor Author

djoshy commented May 23, 2023

/test e2e-gcp-op

@djoshy djoshy force-pushed the remove-journal-pending-config branch from 124a9f9 to 4d38203 Compare May 23, 2023 21:32
@djoshy
Copy link
Contributor Author

djoshy commented May 23, 2023

/test e2e-gcp-op
/test unit
/test verify

@djoshy djoshy force-pushed the remove-journal-pending-config branch from 4d38203 to c3ad9be Compare May 24, 2023 13:03
@djoshy
Copy link
Contributor Author

djoshy commented May 24, 2023

/test verify

@djoshy
Copy link
Contributor Author

djoshy commented May 24, 2023

/test e2e-gcp-op

@djoshy
Copy link
Contributor Author

djoshy commented May 24, 2023

/test e2e-aws-ovn-upgrade

@djoshy djoshy force-pushed the remove-journal-pending-config branch from c3ad9be to a3d6063 Compare May 25, 2023 18:44
@djoshy
Copy link
Contributor Author

djoshy commented May 25, 2023

/test e2e-gcp-op

@djoshy djoshy marked this pull request as ready for review May 26, 2023 14:38
@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 May 26, 2023
@djoshy
Copy link
Contributor Author

djoshy commented May 26, 2023

/test e2e-aws-ovn-upgrade

1 similar comment
@djoshy
Copy link
Contributor Author

djoshy commented May 30, 2023

/test e2e-aws-ovn-upgrade

@djoshy
Copy link
Contributor Author

djoshy commented May 30, 2023

/hold
waiting on #3718 to merge

@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 May 30, 2023
@djoshy djoshy force-pushed the remove-journal-pending-config branch from a3d6063 to 3221924 Compare June 6, 2023 13:54
@djoshy
Copy link
Contributor Author

djoshy commented Jun 8, 2023

/hold cancel
/retest-required

@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 Jun 8, 2023
@djoshy
Copy link
Contributor Author

djoshy commented Jun 8, 2023

/test e2e-aws-ovn-upgrade

@sinnykumari
Copy link
Contributor

Putting hold for qe pre-merge testing
/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 Jun 9, 2023
Copy link
Contributor

@sinnykumari sinnykumari left a comment

Choose a reason for hiding this comment

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

Overall LGTM.
/approve
I am little concerned that this change hitting some corner case regression. But I do agree with Jerry's rationale.
As Jerry has more content of this issue, will be good to get your review as well.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 9, 2023
@djoshy
Copy link
Contributor Author

djoshy commented Jun 15, 2023

/retest-required

@sergiordlr
Copy link

Verified using IPI on AWS.

We run a whole regression but the hypershift test cases.

All cases passed. We add the qe-approved label

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jun 20, 2023
@djoshy
Copy link
Contributor Author

djoshy commented Jun 20, 2023

/unhold

/retest-required

@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 Jun 20, 2023
Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

/lgtm

Thanks for chasing this down David!

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

openshift-ci bot commented Jun 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, sinnykumari, yuqi-zhang

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:
  • OWNERS [sinnykumari,yuqi-zhang]

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 22, 2023

@djoshy: all tests passed!

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.

@openshift-merge-robot openshift-merge-robot merged commit 48af518 into openshift:master Jun 22, 2023
@djoshy djoshy deleted the remove-journal-pending-config branch September 12, 2023 17:38
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-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants