Skip to content

FHC: use exception-safe versions of ets update functions (backport #8790) #8812

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

Merged
merged 6 commits into from
Jul 9, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 9, 2023

This is an automatic backport of pull request #8790 done by Mergify.
Cherry-pick of d5d8689 has failed:

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

You are currently cherry-picking commit d5d8689f54.
  (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_msg_store.erl
	modified:   deps/rabbit_common/src/file_handle_cache.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit_common/src/file_handle_cache_stats.erl
	both modified:   deps/rabbit_common/src/rabbit_misc.erl

Cherry-pick of 1402183 has failed:

On branch mergify/bp/v3.12.x/pr-8790
Your branch is ahead of 'origin/v3.12.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1402183bc2.
  (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_common/src/rabbit_types.erl
	modified:   deps/rabbitmq_web_mqtt/priv/schema/rabbitmq_web_mqtt.schema
	modified:   deps/rabbitmq_web_mqtt/test/config_schema_SUITE_data/rabbitmq_web_mqtt.snippets

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl

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

Otherwise, if the FHC runs into an exception because of an ETS
write failure, most code paths begin failing.

This may help with the condition in #8784.

(cherry picked from commit d5d8689)

# Conflicts:
#	deps/rabbit_common/src/file_handle_cache_stats.erl
#	deps/rabbit_common/src/rabbit_misc.erl
(cherry picked from commit a6c522d)
Via `web_mqtt.enable_file_handle_cache`

(cherry picked from commit 1402183)

# Conflicts:
#	deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl
@michaelklishin michaelklishin merged commit ed08ec5 into v3.12.x Jul 9, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-8790 branch July 9, 2023 07:42
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.

1 participant