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

pool: file: object: clean up health checkers for both types of deletion (backport #9094) #9213

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 19, 2021

This is an automatic backport of pull request #9094 done by Mergify.
Cherry-pick of 03ba7de has failed:

On branch mergify/bp/release-1.7/pr-9094
Your branch is up to date with 'origin/release-1.7'.

You are currently cherry-picking commit 03ba7dec6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/operator/ceph/file/controller.go
	both modified:   pkg/operator/ceph/object/controller.go
	both modified:   pkg/operator/ceph/pool/controller.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Clean up the code used to stop health checkers for all controllers
(pool, file, object). Health checkers should now be stopped when
removing the finalizer for a forced deletion when the CephCluster does
not exist. This prevents leaking a running health checker for a resource
that is going to be imminently removed.

Also tidy the health checker stopping code so that it is similar for all
3 controllers. Of note, the object controller now uses namespace and
name for the object health checker, which would create a problem for
users who create a CephObjectStore with the same name in different
namespaces.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
(cherry picked from commit 03ba7de)

# Conflicts:
#	pkg/operator/ceph/file/controller.go
#	pkg/operator/ceph/object/controller.go
#	pkg/operator/ceph/pool/controller.go
@mergify mergify bot added the conflicts label Nov 19, 2021
@leseb
Copy link
Member

leseb commented Nov 22, 2021

@BlaineEXE PTAL at the conflicts, thanks.

@BlaineEXE
Copy link
Member

I've been looking at the conflicts, and I've given up on resolving them twice already. I can take another stab at it and probably make some better progress, but I have been wondering if the time spent massaging the conflicts is really worth it. After all, the workaround for the goroutine leaks is to restart the operator, which is pretty simple. I don't see a strong reason to spend several more hours on this given other things that need doing. I'm also open to someone giving me a good reason to light a fire under my butt to give this another go.

@travisn
Copy link
Member

travisn commented Nov 23, 2021

I've been looking at the conflicts, and I've given up on resolving them twice already. I can take another stab at it and probably make some better progress, but I have been wondering if the time spent massaging the conflicts is really worth it. After all, the workaround for the goroutine leaks is to restart the operator, which is pretty simple. I don't see a strong reason to spend several more hours on this given other things that need doing. I'm also open to someone giving me a good reason to light a fire under my butt to give this another go.

Since 1.8 is so close, how about we not worry about this? Or was there a specific request for this backport?

@BlaineEXE
Copy link
Member

Since 1.8 is so close, how about we not worry about this? Or was there a specific request for this backport?

I think the request was that it would be nice, but I'm not sure we realized it would be this complex to backport.

@leseb
Copy link
Member

leseb commented Nov 24, 2021

It seems that the original PR was a cleanup/refactor so not something critical to backport, nice to have as @BlaineEXE mentioned. Also, 1.8 is relatively close so let's not worry too much for now.

@leseb leseb closed this Nov 24, 2021
@leseb leseb deleted the mergify/bp/release-1.7/pr-9094 branch November 24, 2021 08:25
@BlaineEXE BlaineEXE restored the mergify/bp/release-1.7/pr-9094 branch December 13, 2021 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants