Skip to content

amqp_client_SUITE: Fix frequent test failures (backport #13409) #13475

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 8 commits into from
Closed

amqp_client_SUITE: Fix frequent test failures (backport #13409) #13475

wants to merge 8 commits into from

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 8, 2025

  • amqp_client_SUITE: Use a dedicated CI job for this testsuite
  • amqp10_client: Handle close message in the open_sent state
  • amqp10_client: Fix crash in close_sent
  • amqp_client_SUITE: Retry connection in two testcases
  • amqp_client_SUITE: Ensure idle_time_out_on_server restores heartbeat value
  • amqp_client_SUITE: Use a dedicated AMQP-0-9-1 connection per testcase
  • amqp_client_SUITE: Close all connections in end_per_testcase/2
    This is an automatic backport of pull request amqp_client_SUITE: Fix frequent test failures #13409 done by Mergify.

dumbbell and others added 8 commits March 8, 2025 11:48
@dumbbell @mergify
amqp_client_SUITE: Use a dedicated CI job for this testsuite
b4995d0 
[Why]
This testsuite is very unstable and it is difficult to debug while it is
part of a `parallel-ct` group. It also forced us to re-run the entire
`parallel-ct` group just to retry that one testsuite.

(cherry picked from commit 2c66191)

# Conflicts:
#	deps/rabbit/Makefile
@dumbbell @mergify
amqp10_client: Handle close message in the open_sent state
ae405e2 
[Why]
Without this, the connection process crashes. We see this happenning in
CI frequently.

(cherry picked from commit 77e3636)

# Conflicts:
#	deps/amqp10_client/src/amqp10_client_connection.erl
@ansd @mergify
amqp10_client: Fix crash in close_sent
0b5dc9d 
Fix crash in close_sent since the client might receive the open frame if
it previously sent the close frame in state open_sent.

We explicitly ignore the open frame. The alternative is to add another
gen_statem state CLOSE_PIPE which  might be an overkill however.

This commit also fixes a wrong comment: No sessions have begun if the
app requests the connection to be closed in state open_sent.

(cherry picked from commit 6557686)

# Conflicts:
#	deps/amqp10_client/src/amqp10_client_connection.erl
@dumbbell @mergify
amqp_client_SUITE: Retry connection in two testcases
91c2e9c 
The testcases are `leader_transfer_credit` and
`dead_letter_into_stream`.

(cherry picked from commit 603ad0d)

# Conflicts:
#	deps/rabbit/test/amqp_client_SUITE.erl
@dumbbell @mergify
amqp_client_SUITE: Ensure idle_time_out_on_server restores heartbea…
5151bef 
…t value

[Why]
If the testcase fails, it was leaving the low heartbeat value in place,
leading to many subsequent tests to fail.

(cherry picked from commit 6084055)

# Conflicts:
#	deps/rabbit/test/amqp_client_SUITE.erl
@dumbbell @mergify
amqp_client_SUITE: Use a dedicated AMQP-0-9-1 connection per testcase
2e3ca96 
... instead of a global one. Otherwise, one connection failure, even if
expected by a testcase, will affect all subsequent testcases negatively.

(cherry picked from commit ce5ba6d)

# Conflicts:
#	deps/rabbit/test/amqp_client_SUITE.erl
@dumbbell @mergify
amqp_client_SUITE: Close all connections in end_per_testcase/2
8e04516 
[Why]
Many tests do not clean up their connections if they encounter a
failure. This affects subsequent testcases negatively.

(cherry picked from commit 4d12efa)
@ansd @mergify
Apply PR feedback
3d0468a 
(cherry picked from commit 0f9b693)
@mergify
Copy link
Author

mergify bot commented Mar 8, 2025

Cherry-pick of 2c66191 has failed:

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

You are currently cherry-picking commit 2c6619104.
  (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:   .github/workflows/test-make-tests.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/Makefile

Cherry-pick of 77e3636 has failed:

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

You are currently cherry-picking commit 77e363627.
  (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/amqp10_client/src/amqp10_client_connection.erl

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

Cherry-pick of 6557686 has failed:

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

You are currently cherry-picking commit 65576863f.
  (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/amqp10_client/src/amqp10_client_connection.erl

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

Cherry-pick of 603ad0d has failed:

On branch mergify/bp/v4.0.x/pr-13409
Your branch is ahead of 'origin/v4.0.x' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 603ad0d7e.
  (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/rabbit/test/amqp_client_SUITE.erl

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

Cherry-pick of 6084055 has failed:

On branch mergify/bp/v4.0.x/pr-13409
Your branch is ahead of 'origin/v4.0.x' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 608405518.
  (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/rabbit/test/amqp_client_SUITE.erl

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

Cherry-pick of ce5ba6d has failed:

On branch mergify/bp/v4.0.x/pr-13409
Your branch is ahead of 'origin/v4.0.x' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ce5ba6da0.
  (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/rabbit/test/amqp_client_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

@mergify mergify bot added the conflicts label Mar 8, 2025
@mergify mergify bot mentioned this pull request Mar 8, 2025
Merged
@mergify mergify bot added the make label Mar 8, 2025
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-13409 branch March 8, 2025 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts make

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@michaelklishin @dumbbell @ansd