Skip to content

Monitor members to the same stream in stream connection (backport #9572) (backport #9576) #9577

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 3 commits into from
Sep 28, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 28, 2023

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

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

You are currently cherry-picking commit 3273003ef2.
  (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/rabbitmq_stream/src/rabbit_stream_reader.erl
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/FailureTest.java
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/Host.java
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/TestUtils.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl

Cherry-pick of d1f597a has failed:

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

You are currently cherry-picking commit d1f597aae2.
  (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.com

This commit change makes sure that different members
of the same stream are monitored in a given connection.
A connection can use the stream leader for a publisher
and a replica for a consumer, if the replica crashes
for some reason, the connection must detect it and
send a metadata notification to the client.

Note that client connections should still use different
connections for publishers and consumers.

(cherry picked from commit 289fc51)
(cherry picked from commit 3273003)

# Conflicts:
#	deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
(cherry picked from commit 07d7f09)
(cherry picked from commit d1f597a)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
@mergify mergify bot added the conflicts label Sep 28, 2023
@michaelklishin michaelklishin merged commit 3b8404b into v3.11.x Sep 28, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-9576 branch September 28, 2023 19:17
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