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

docs/README: Useless bump to get a new commit hash #2584

Merged

Conversation

wking
Copy link
Member

@wking wking commented May 20, 2021

The MCO has a bug where it relies on its commit hash to mark the target version of rendered MachineConfigs. We didn't get a bump, or even a rebuild between 4.7.11 and 4.7.12:

$ oc adm release info --commits quay.io/openshift-release-dev/ocp-release:4.7.11-x86_64 | grep machine-config-operator
  machine-config-operator                        https://github.com/openshift/machine-config-operator                        e3863b02b7403342cdf0f981889e8c3cfc2d86bb
$ oc adm release info --commits quay.io/openshift-release-dev/ocp-release:4.7.12-x86_64 | grep machine-config-operator
  machine-config-operator                        https://github.com/openshift/machine-config-operator                        e3863b02b7403342cdf0f981889e8c3cfc2d86bb

So the MCO starts updating the pools between the two releases and immediately says "ahh, looks like I've already finished updating", when it hasn't. Lots of example jobs linked from here, including this one:

the "master" pool should be updated before the CVO reports available at the new version

From that job:

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/logs/release-openshift-origin-installer-e2e-aws-upgrade/1395451649530531840/build-log.txt | grep 'clusteroperator/machine-config.*version'
INFO[2021-05-20T20:59:59Z] May 20 20:39:58.483 I /machine-config reason/OperatorVersionChanged clusteroperator/machine-config-operator started a version change from [{operator 4.7.11}] to [{operator 4.7.12}]
INFO[2021-05-20T20:59:59Z] May 20 20:40:04.662 I /machine-config reason/OperatorVersionChanged clusteroperator/machine-config-operator version changed from [{operator 4.7.11}] to [{operator 4.7.12}]
INFO[2021-05-20T20:59:59Z] May 20 20:40:04.815 I clusteroperator/machine-config versions: operator 4.7.11 -> 4.7.12
INFO[2021-05-20T20:59:59Z] May 20 20:40:05.420 W clusteroperator/machine-config changed Progressing to False: Cluster version is 4.7.12

The machine-config operator didn't actually roll all the control-plane nodes in six seconds.

The useless docs bump will give us a new commit hash, so the MCO will understand that a 4.7.11 -> 4.7.13 bump is a real update that takes some time to roll out. Once we get the bug fixed, we won't need hacks like this for future releases.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 20, 2021

@wking: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

docs/README: Drop useless bump to get a new commit hash

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 review from cgwalters and runcom May 20, 2021 23:26
@wking wking changed the title docs/README: Drop useless bump to get a new commit hash docs/README: Useless bump to get a new commit hash May 20, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 20, 2021

@wking: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

docs/README: Useless bump to get a new commit hash

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.

The MCO has a bug where it relies on its commit hash to mark the
target version of rendered MachineConfigs [1].  We didn't get a bump,
or even a rebuild between 4.7.11 and 4.7.12:

  $ oc adm release info --commits quay.io/openshift-release-dev/ocp-release:4.7.11-x86_64 | grep machine-config-operator
    machine-config-operator                        https://github.com/openshift/machine-config-operator                        e3863b0
  $ oc adm release info --commits quay.io/openshift-release-dev/ocp-release:4.7.12-x86_64 | grep machine-config-operator
    machine-config-operator                        https://github.com/openshift/machine-config-operator                        e3863b0

So the MCO starts updating the pools between the two releases and
immediately says "ahh, looks like I've already finished updating",
when it hasn't.  Lots of example jobs linked from [2], including [3]:

  the "master" pool should be updated before the CVO reports available at the new version

From that job:

  $ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/logs/release-openshift-origin-installer-e2e-aws-upgrade/1395451649530531840/build-log.txt | grep 'clusteroperator/machine-config.*version'
  INFO[2021-05-20T20:59:59Z] May 20 20:39:58.483 I /machine-config reason/OperatorVersionChanged clusteroperator/machine-config-operator started a version change from [{operator 4.7.11}] to [{operator 4.7.12}]
  INFO[2021-05-20T20:59:59Z] May 20 20:40:04.662 I /machine-config reason/OperatorVersionChanged clusteroperator/machine-config-operator version changed from [{operator 4.7.11}] to [{operator 4.7.12}]
  INFO[2021-05-20T20:59:59Z] May 20 20:40:04.815 I clusteroperator/machine-config versions: operator 4.7.11 -> 4.7.12
  INFO[2021-05-20T20:59:59Z] May 20 20:40:05.420 W clusteroperator/machine-config changed Progressing to False: Cluster version is 4.7.12

The machine-config operator didn't actually roll all the control-plane
nodes in six seconds.

The useless docs bump will give us a new commit hash, so the MCO will
understand that a 4.7.11 -> 4.7.13 bump is a real update that takes
some time to roll out.  Once we get [1] fixed, we won't need hacks
like this for future releases.

[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1955929#c1
[2]: https://amd64.ocp.releases.ci.openshift.org/releasestream/4-stable/release/4.7.12#upgrades-from
[3]: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/release-openshift-origin-installer-e2e-aws-upgrade/1395451649530531840
@wking wking force-pushed the useless-docs-bump-to-rev-commit-hash branch from d2621b4 to 31638f9 Compare May 20, 2021 23:27
@wking wking added approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. labels May 20, 2021
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

as a one-off to get a 4.7 release, this seems fine to me

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 20, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wking, 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:

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

@wking
Copy link
Member Author

wking commented May 20, 2021

Manually setting labels for this hack workaround that cannot possibly break anything ;)

@yuqi-zhang
Copy link
Contributor

/override ci/prow/e2e-agnostic-upgrade
/override ci/prow/e2e-aws-serial

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 20, 2021

@yuqi-zhang: Overrode contexts on behalf of yuqi-zhang: ci/prow/e2e-agnostic-upgrade, ci/prow/e2e-aws-serial

In response to this:

/override ci/prow/e2e-agnostic-upgrade
/override ci/prow/e2e-aws-serial

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-robot openshift-merge-robot merged commit fdf0b39 into release-4.7 May 20, 2021
@wking wking deleted the useless-docs-bump-to-rev-commit-hash branch May 20, 2021 23:54
@sinnykumari
Copy link
Contributor

Does this give a hint that we need to backport fixes more frequently ;)

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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

4 participants