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

Remove duplicated checks of vhost queue limit (backport #11301) #11330

Merged
merged 2 commits into from
May 27, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 27, 2024

Proposed Changes

#11222 moved the check of vhost queue limit to rabbit_queue_type:declare. I did miss that there are checks from other sources too, so I have updated those sources to reflect the changes. Basically removed the check, and handle the precondition error better.

This 'might' have changed the logging msg some, which might or might not be OK?

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

Checklist

Put an x in the boxes that apply.
You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask on the mailing list.
We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING.md document
  • I have signed the CA (see https://cla.pivotal.io/sign/rabbitmq)
  • I have added tests that prove my fix is effective or that my feature works
  • All tests pass locally with my changes
  • If relevant, I have added necessary documentation to https://github.com/rabbitmq/rabbitmq-website
  • If relevant, I have added this change to the first version(s) in release-notes that I expect to introduce it

Further Comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution
you did and what alternatives you considered, etc.


This is an automatic backport of pull request #11301 done by [Mergify](https://mergify.com).

…ype:declare

Add new error return tuple when queue limit is exceed

(cherry picked from commit 19a7518)

# Conflicts:
#	deps/rabbit/src/rabbit_amqp_management.erl
#	deps/rabbit/src/rabbit_amqp_session.erl
#	deps/rabbit/test/amqp_auth_SUITE.erl
Copy link
Author

mergify bot commented May 27, 2024

Cherry-pick of 19a7518 has failed:

On branch mergify/bp/v3.13.x/pr-11301
Your branch is up to date with 'origin/v3.13.x'.

You are currently cherry-picking commit 19a751890c.
  (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:   deps/rabbit/src/rabbit_amqqueue.erl
	modified:   deps/rabbit/src/rabbit_channel.erl
	modified:   deps/rabbit/src/rabbit_queue_type.erl
	modified:   deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl
	modified:   deps/rabbitmq_stream/src/rabbit_stream_manager.erl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   deps/rabbit/src/rabbit_amqp_management.erl
	deleted by us:   deps/rabbit/src/rabbit_amqp_session.erl
	deleted by us:   deps/rabbit/test/amqp_auth_SUITE.erl

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

@ansd ansd self-assigned this May 27, 2024
@ansd ansd merged commit fd943bc into v3.13.x May 27, 2024
18 checks passed
@ansd ansd deleted the mergify/bp/v3.13.x/pr-11301 branch May 27, 2024 15:10
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

2 participants