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

rabbitmq_peer_discovery_etcd: Wait for etcd start in system_SUITE (backport #12985) #12988

Merged
merged 2 commits into from
Dec 20, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 19, 2024

Why

It was possible that testcases were executed before the etcd daemon was ready, leading to test failures.

How

There was already a santy check to verify that the etcd daemon was working correctly, but it was itself a testcase.

This patch moves this code to the etcd start code to wait for it to be ready.

This replaces the previous workaround of waiting for 2 seconds.

While here, log anything printed to stdout/stderr by etcd after it exited.

Fixes #12981.


This is an automatic backport of pull request #12985 done by Mergify.

[Why]
It was possible that testcases were executed before the etcd daemon was
ready, leading to test failures.

[How]
There was already a santy check to verify that the etcd daemon was
working correctly, but it was itself a testcase.

This patch moves this code to the etcd start code to wait for it to be
ready.

This replaces the previous workaround of waiting for 2 seconds.

While here, log anything printed to stdout/stderr by etcd after it
exited.

Fixes #12981.

(cherry picked from commit d54b2bf)

# Conflicts:
#	deps/rabbitmq_peer_discovery_etcd/test/system_SUITE.erl
@mergify mergify bot added the conflicts label Dec 19, 2024
Copy link
Author

mergify bot commented Dec 19, 2024

Cherry-pick of d54b2bf has failed:

On branch mergify/bp/v4.0.x/pr-12985
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit d54b2bff3.
  (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_peer_discovery_etcd/test/system_SUITE.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@michaelklishin michaelklishin added this to the 4.0.6 milestone Dec 19, 2024
@michaelklishin michaelklishin merged commit 9cf304c into v4.0.x Dec 20, 2024
271 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12985 branch December 20, 2024 01:12
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