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

rgw: change the way to livenessProbe and introduce readinessProbe (backport #8643) #9073

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 29, 2021

This is an automatic backport of pull request #8643 done by Mergify.
Cherry-pick of 536b59e has failed:

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

You are currently cherry-picking commit 536b59ef0.
  (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)

Changes to be committed:
	modified:   cluster/charts/rook-ceph/templates/resources.yaml
	modified:   cluster/examples/kubernetes/ceph/crds.yaml
	modified:   cluster/examples/kubernetes/ceph/object-ec.yaml
	modified:   cluster/examples/kubernetes/ceph/object-openshift.yaml
	modified:   cluster/examples/kubernetes/ceph/object.yaml
	modified:   pkg/apis/ceph.rook.io/v1/types.go
	modified:   pkg/apis/ceph.rook.io/v1/zz_generated.deepcopy.go
	modified:   pkg/operator/ceph/config/livenessprobe.go
	modified:   pkg/operator/ceph/config/livenessprobe_test.go
	modified:   pkg/operator/ceph/object/spec.go
	modified:   pkg/operator/ceph/object/spec_test.go
	modified:   tests/integration/ceph_base_object_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/canary-integration-test.yml
	both modified:   tests/scripts/github-action-helper.sh

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

rgw doesn't respond `livenessProbe` if the number of connection reaches its
limit (by default, 1000). Then rgw is out of service but still live.
Hense the current `livenessProbe` logic is suitiable for `readinessProbe`.
`tcpSocket` is enough for `livenessProbe`.

Closes: #8407

Signed-off-by: Yuzuki Mimura <yuzuki725.m@gmail.com>
Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
(cherry picked from commit 536b59e)

# Conflicts:
#	.github/workflows/canary-integration-test.yml
#	tests/scripts/github-action-helper.sh
@mergify mergify bot added the conflicts label Oct 29, 2021
@satoru-takeuchi
Copy link
Member

I'll fix this conflict later.

@satoru-takeuchi
Copy link
Member

The conflict will be fixed in #9080 .

@mergify mergify bot deleted the mergify/bp/release-1.7/pr-8643 branch October 31, 2021 21:07
@travisn
Copy link
Member

travisn commented Nov 1, 2021

btw you should be able to force push to the branch opened by the bot, but no problem to have the new PR if you prefer.

@satoru-takeuchi
Copy link
Member

@travisn Oh, I've taughut this knowledge from you and have completely been forgot it at all.

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