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.

Sign up for GitHub

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

Jump to bottom

Bug 1826443: Pod Config Deployment Hash Error #1472

Merged
merged 1 commit into from May 20, 2020
Merged

Bug 1826443: Pod Config Deployment Hash Error #1472

merged 1 commit into from May 20, 2020

Conversation

awgreene
Copy link
Member

@awgreene awgreene commented Apr 21, 2020 •
edited

The Pod Config e2e test have been failing because the deployment is not reinstalled when the actual deployment hash does not match the calculated deployment hash. This commit updates OLM to reinstall a deployment when the hash doesn't match the calculated hash.

@awgreene awgreene force-pushed the podconfig-test-flake branch 3 times, most recently from 97a081f to 860075b Compare April 21, 2020 15:23
@awgreene awgreene changed the title Pod Config Deployment Hash Error Bug 1826443: Pod Config Deployment Hash Error May 14, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label May 14, 2020
@openshift-ci-robot
Copy link
Collaborator

@awgreene: This pull request references Bugzilla bug 1826443, 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.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1826443: Pod Config Deployment Hash Error

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/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 14, 2020
Bowenislandsong
Bowenislandsong reviewed May 14, 2020
View reviewed changes
Copy link
Member

@Bowenislandsong Bowenislandsong left a comment

Choose a reason for hiding this comment

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

one small thing, otherwise looks great!

pkg/controller/install/errors.go Outdated Show resolved Hide resolved
@awgreene awgreene force-pushed the podconfig-test-flake branch 2 times, most recently from e5e7cf1 to 83b9ccf Compare May 14, 2020 19:25
@awgreene
Pod Config Deployment Hash Error
d9d9b49 
The Pod Config e2e test have been failing because the deployment is not
reinstalled when the actual deployment hash does not match the
calculated deployment hash. This commit updates OLM to reinstall a
deployment when the hash doesn't match the calculated
hash.
@awgreene
Copy link
Member Author

e2e-gcp-upgrade failed to bootstrap
/retest

benluddy
benluddy reviewed May 15, 2020
View reviewed changes
Copy link
Contributor

@benluddy benluddy left a comment

Choose a reason for hiding this comment

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

Looks good, just left one question for you.

pkg/controller/install/errors.go
return ok
}

func reasonForError(err error) string {
func ReasonForError(err error) string {
Copy link
Contributor

@benluddy benluddy May 15, 2020 •
edited

Choose a reason for hiding this comment

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

Just thinking "out loud" here: it might be nice to (later!) use some of the newer error wrapping features from the standard library in place of the {Reason, Message} that exists today.

test/e2e/subscription_e2e_test.go
@@ -1212,10 +1212,6 @@ var _ = Describe("Subscription", func() {
require.NotNil(GinkgoT(), subscription)

csv, err := fetchCSV(GinkgoT(), crClient, subscription.Status.CurrentCSV, testNamespace, buildCSVConditionChecker(v1alpha1.CSVPhaseSucceeded))
if err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

🎉

pkg/controller/operators/olm/operator.go
if install.ReasonForError(strategyErr) == install.StrategyErrDeploymentUpdated {
csv.SetPhaseWithEventIfChanged(v1alpha1.CSVPhaseInstallReady, requeueConditionReason, fmt.Sprintf("installing: %s", strategyErr), now, a.recorder)
} else {
csv.SetPhaseWithEventIfChanged(requeuePhase, requeueConditionReason, fmt.Sprintf("installing: %s", strategyErr), now, a.recorder)
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the reason InstallWaiting when this branch is hit, and is that the most appropriate reason in this case?

Copy link
Member

Choose a reason for hiding this comment

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

This is somewhat weird given the function signature - you would expect the requeue phase to be used.

Copy link
Member

Choose a reason for hiding this comment

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

Discussed offline - this whole state management should probably be refactored to make this behavior clearer, but doing so here would make it difficult to backport.

@awgreene
Copy link
Member Author

/retest

1 similar comment
@awgreene
Copy link
Member Author

/retest

@ecordell
Copy link
Member

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, ecordell

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 18, 2020
@kevinrizza
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 19, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

3 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 80e90dd into operator-framework:master May 20, 2020
@openshift-ci-robot
Copy link
Collaborator

@awgreene: All pull requests linked via external trackers have merged: operator-framework/operator-lifecycle-manager#1472. Bugzilla bug 1826443 has been moved to the MODIFIED state.

In response to this:

Bug 1826443: Pod Config Deployment Hash Error

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.

@ecordell
Copy link
Member

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

@ecordell: #1472 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/controller/operators/olm/operator.go
M	pkg/controller/operators/olm/operator_test.go
M	test/e2e/subscription_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/subscription_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/subscription_e2e_test.go
Auto-merging pkg/controller/operators/olm/operator_test.go
Auto-merging pkg/controller/operators/olm/operator.go
Patch failed at 0001 Pod Config Deployment Hash Error

In response to this:

/cherry-pick release-4.4

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
Reviewers

@ecordell ecordell ecordell left review comments

@benluddy benluddy benluddy left review comments

@Bowenislandsong Bowenislandsong Bowenislandsong left review comments

@exdx exdx Awaiting requested review from exdx

@njhale njhale Awaiting requested review from njhale

Assignees

@kevinrizza kevinrizza

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@awgreene @openshift-ci-robot @ecordell @kevinrizza @openshift-bot @openshift-cherrypick-robot @benluddy @Bowenislandsong @openshift-merge-robot