Skip to content

Handle closed connections in stream reader (backport #3397) #3412

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 #3397 done by Mergify.
Cherry-pick of d6301a3 has failed:

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

You are currently cherry-picking commit d6301a3e11.
  (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 f10db03 has failed:

On branch mergify/bp/v3.9.x/pr-3397
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 f10db03b4d.
  (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 3b1714c has failed:

On branch mergify/bp/v3.9.x/pr-3397
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 3b1714cbe3.
  (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/

and throw and stop gracefully.

(cherry picked from commit d6301a3)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
when the client forcefully terminates TCP connection

Also improve logging.

(cherry picked from commit f10db03)

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

# 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-3397 branch September 13, 2021 09:50
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