Skip to content

Stream reader: close osiris logs and sockets in terminate (backport #3413) #3418

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

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 13, 2021

This is an automatic backport of pull request #3413 done by Mergify.
Cherry-pick of 9e45060 has failed:

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

You are currently cherry-picking commit 9e4506041d.
  (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:   deps/rabbitmq_stream/src/rabbit_stream_reader.erl

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

Cherry-pick of c8d4838 has failed:

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

You are currently cherry-picking commit c8d483809e.
  (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:   deps/rabbitmq_stream/src/rabbit_stream_reader.erl

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

kjnilsson and others added 3 commits September 13, 2021 17:50
Instead of injecting it into varios places inside the code.

When the osiris log is closed it will decrement the global "readers"
counter which is why it is much safer to do this in terminate.

(cherry picked from commit 135575b)
(cherry picked from commit 9e45060)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
(cherry picked from commit c8d4838)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
@mergify mergify bot added the conflicts label Sep 13, 2021
@mergify mergify bot deleted the mergify/bp/v3.9.x/pr-3413 branch September 13, 2021 17:50
@michaelklishin
Copy link
Collaborator

Backported to v3.9.x (manually).

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.

2 participants