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

Bug 1768255: replace Fraction with Done and Total #497

Merged
merged 1 commit into from Jan 21, 2021

Conversation

jottofar
Copy link
Contributor

@jottofar jottofar commented Jan 14, 2021

Make Done and Total available to syncStatus and calculate percent complete locally. Use math.Trunc to avoid rounding which occurs when only %.0f is used. This can also cause us to display 100% complete when Done != Total.

Also dropped pkg/cvo/cvo_scenarios_test.go's use of diff.ObjectReflectDiff. Method was causing a panic and is also deprecated in favor of cmp.Diff. cmp.Diff does not print out difference so simply logged expected and actual values instead.

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. label Jan 14, 2021
@openshift-ci-robot
Copy link
Contributor

@jottofar: This pull request references Bugzilla bug 1768255, which is invalid:

  • expected the bug to target the "4.7.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1768255: pkg/cvo/sync_worker.go: change Complete Fraction

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 openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jan 14, 2021
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 14, 2021
@jottofar
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jan 14, 2021
@openshift-ci-robot
Copy link
Contributor

@jottofar: This pull request references Bugzilla bug 1768255, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

In response to this:

/bugzilla refresh

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.

@jottofar jottofar changed the title Bug 1768255: pkg/cvo/sync_worker.go: change Complete Fraction Bug 1768255: replace Fraction with Done and Total Jan 15, 2021
@openshift-ci-robot
Copy link
Contributor

@jottofar: This pull request references Bugzilla bug 1768255, which is valid.

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

In response to this:

Bug 1768255: replace Fraction with Done and Total

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.

@jottofar
Copy link
Contributor Author

/test e2e-agnostic

pkg/cvo/sync_worker.go Outdated Show resolved Hide resolved
@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 20, 2021
pkg/cvo/status.go Outdated Show resolved Hide resolved
@wking
Copy link
Member

wking commented Jan 20, 2021

I left a few minor nits and questions inline; overall looks great to me :). update jobs use A->B->A rollback testing:

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_cluster-version-operator/497/pull-ci-openshift-cluster-version-operator-master-e2e-agnostic-upgrade/1351187522234880000/artifacts/e2e-agnostic-upgrade/gather-extra/clusterversion.json | jq -r '.items[].status.history[] | .startedTime + " " + (.completionTime // "-") + " " + .state + " " + .version + " " + (.verified | tostring)'
2021-01-18T16:39:08Z 2021-01-18T17:19:33Z Completed 4.7.0-0.ci.test-2021-01-18-152125-ci-op-djqib51v false
2021-01-18T16:03:13Z 2021-01-18T16:39:08Z Partial 4.7.0-0.ci.test-2021-01-18-152608-ci-op-djqib51v false
2021-01-18T15:35:09Z 2021-01-18T15:59:12Z Completed 4.7.0-0.ci.test-2021-01-18-152125-ci-op-djqib51v false

So 16:03:13Z through 16:39:08Z should have the new messages. And it does:

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_cluster-version-operator/497/pull-ci-openshift-cluster-version-operator-master-e2e-agnostic-upgrade/1351187522234880000/artifacts/e2e-agnostic-upgrade/openshift-e2e-test/e2e.log | grep ' 16:\([02]\|3[0-8]\).*% complete' | sort
Jan 18 16:03:48.517: INFO: cluster upgrade is Progressing: Working towards 4.7.0-0.ci.test-2021-01-18-152608-ci-op-djqib51v: 4 of 662 done (0% complete)
Jan 18 16:03:58.515: INFO: cluster upgrade is Progressing: Working towards 4.7.0-0.ci.test-2021-01-18-152608-ci-op-djqib51v: 70 of 662 done (10% complete)
Jan 18 16:04:08.517: INFO: cluster upgrade is Progressing: Working towards 4.7.0-0.ci.test-2021-01-18-152608-ci-op-djqib51v: 70 of 662 done (10% complete)
...
Jan 18 16:38:58.517: INFO: cluster upgrade is Progressing: Working towards 4.7.0-0.ci.test-2021-01-18-152608-ci-op-djqib51v: 554 of 662 done (83% complete), waiting on machine-config

@openshift-ci-robot
Copy link
Contributor

@jottofar: This pull request references Bugzilla bug 1768255, which is valid.

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

In response to this:

Bug 1768255: replace Fraction with Done and Total

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.

@jottofar
Copy link
Contributor Author

/retest

pkg/cvo/status.go Outdated Show resolved Hide resolved
Make Done and Total available to syncStatus and calculate percent
complete locally. Use math.Trunc to avoid rounding which occurs
when only %.0f is used. This can also cause us to display 100%
complete when Done != Total.

Also dropped pkg/cvo/cvo_scenarios_test.go's use of diff.ObjectReflectDiff.
Method was causing a panic and is also deprecated in favor of cmp.Diff.
cmp.Diff does not print out difference so simply logged expected and actual
values instead.
@openshift-ci-robot
Copy link
Contributor

@jottofar: This pull request references Bugzilla bug 1768255, which is valid.

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

In response to this:

Bug 1768255: replace Fraction with Done and Total

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.

@wking
Copy link
Member

wking commented Jan 20, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2021
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jottofar, wking

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

wking commented Jan 21, 2021

hold reason got fixed.

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 21, 2021
@openshift-merge-robot openshift-merge-robot merged commit f9c42b2 into openshift:master Jan 21, 2021
@openshift-ci-robot
Copy link
Contributor

@jottofar: All pull requests linked via external trackers have merged:

Bugzilla bug 1768255 has been moved to the MODIFIED state.

In response to this:

Bug 1768255: replace Fraction with Done and Total

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.

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/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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