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

OCPBUGS-12260: Add backoff for successful storage policy creations #148

Merged
merged 1 commit into from
Apr 24, 2023
Merged

OCPBUGS-12260: Add backoff for successful storage policy creations #148

merged 1 commit into from
Apr 24, 2023

Conversation

gnufied
Copy link
Member

@gnufied gnufied commented Apr 20, 2023 •
edited
Loading

Also remove targetconfigController

Fixes https://issues.redhat.com/browse/OCPBUGS-12260

@openshift-ci-robot
Copy link
Contributor

@gnufied: Jira Issue OCPBUGS-11868 is in a security level that is not in the allowed security levels for this repo.
Allowed security levels for this repo are:

  • Red Hat Employee
  • default

In response to this:

Also remove targetconfigController

Fixes https://issues.redhat.com/browse/OCPBUGS-11868

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
Copy link
Contributor

openshift-ci bot commented Apr 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gnufied

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2023
@gnufied
Copy link
Member Author

gnufied commented Apr 20, 2023

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@gnufied: Jira Issue OCPBUGS-11868 is in a security level that is not in the allowed security levels for this repo.
Allowed security levels for this repo are:

  • Red Hat Employee
  • default

In response to this:

/jira 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.

@gnufied
Copy link
Member Author

gnufied commented Apr 20, 2023

/cherry-pick release-4.13

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.13

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.

@gnufied
Copy link
Member Author

gnufied commented Apr 20, 2023

/retest

@gnufied gnufied changed the title OCPBUGS-11868: Add backoff for successful storage policy creations OCPBUGS-12260: Add backoff for successful storage policy creations Apr 21, 2023
@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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 21, 2023
@openshift-ci-robot
Copy link
Contributor

@gnufied: This pull request references Jira Issue OCPBUGS-12260, 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.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request.

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

In response to this:

Also remove targetconfigController

Fixes https://issues.redhat.com/browse/OCPBUGS-12260

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.

@gnufied
Copy link
Member Author

gnufied commented Apr 21, 2023

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@gnufied: This pull request references Jira Issue OCPBUGS-12260, which is valid.

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

No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request.

In response to this:

/jira 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.

dobsonj
dobsonj reviewed Apr 21, 2023
View reviewed changes
pkg/operator/storageclasscontroller/storageclasscontroller.go Outdated Show resolved Hide resolved
pkg/operator/storageclasscontroller/storageclasscontroller.go Outdated Show resolved Hide resolved
pkg/operator/storageclasscontroller/storageclasscontroller_test.go
@@ -167,6 +168,9 @@ func TestSync(t *testing.T) {
}
// err will be nil on even on failure, need to check conditions instead
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment still valid?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeha still valid though. I mainly fixed an issue with go checker errors.

pkg/operator/storageclasscontroller/storageclasscontroller_test.go Outdated
Comment on lines 226 to 241
// err will be nil on even on failure, need to check conditions instead
err := scController.Sync(context.TODO(), conn, apiDeps)
if err != nil && !test.expectError {
t.Errorf("failed to sync controller: %+v", err)
}
Copy link
Member

Choose a reason for hiding this comment

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

Same question here, it's a little confusing to see a comment "err will be nil on failure" followed by checking err != nil.

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 have rewritten the actual test code to be better at catching error conditions.

@gnufied
Add backoff for successful storage policy creations
71ecb83 
Also remove targetconfigController
@gnufied gnufied force-pushed the reduce-storage-policy-resync-interval branch from 0e3cdcc to 71ecb83 Compare April 24, 2023 15:09
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 24, 2023

@gnufied: 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.

@dobsonj
Copy link
Member

dobsonj commented Apr 24, 2023

Thanks 👍
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 24, 2023
@openshift-ci openshift-ci bot merged commit 7aa7f8d into openshift:master Apr 24, 2023
@openshift-ci-robot
Copy link
Contributor

@gnufied: Jira Issue OCPBUGS-12260: All pull requests linked via external trackers have merged:

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

In response to this:

Also remove targetconfigController

Fixes https://issues.redhat.com/browse/OCPBUGS-12260

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 openshift-cherrypick-robot mentioned this pull request Apr 24, 2023
Merged
@openshift-cherrypick-robot
Copy link

@gnufied: new pull request created: #150

In response to this:

/cherry-pick release-4.13

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.

@gnufied
Copy link
Member Author

gnufied commented Apr 25, 2023

/cherry-pick release-4.12

@openshift-cherrypick-robot
Copy link

@gnufied: #148 failed to apply on top of branch "release-4.12":

Applying: Add backoff for successful storage policy creations
Using index info to reconstruct a base tree...
M	pkg/operator/storageclasscontroller/storageclasscontroller.go
M	pkg/operator/storageclasscontroller/storageclasscontroller_test.go
Falling back to patching base and 3-way merge...
Removing pkg/operator/targetconfigcontroller/targetconfigcontroller_test.go
Removing pkg/operator/targetconfigcontroller/targetconfigcontroller.go
Auto-merging pkg/operator/storageclasscontroller/storageclasscontroller_test.go
Auto-merging pkg/operator/storageclasscontroller/storageclasscontroller.go
CONFLICT (content): Merge conflict in pkg/operator/storageclasscontroller/storageclasscontroller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add backoff for successful storage policy creations
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.12

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

@dobsonj dobsonj dobsonj left review comments

@jsafrane jsafrane Awaiting requested review from jsafrane

@tsmetana tsmetana Awaiting requested review from tsmetana

Assignees

@dobsonj dobsonj

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. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gnufied @openshift-ci-robot @openshift-cherrypick-robot @dobsonj