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

[20060] Fix data race on writer destruction while sending hearbeat (backport #4076) #4166

Merged
merged 1 commit into from
Jan 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2023

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


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

* Add regression test

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Protect changes release when destroying writer

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Apply suggestions

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Fix warning

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

---------

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
(cherry picked from commit 61e1c6a)
@JesusPoderoso JesusPoderoso added this to the v2.11.3 milestone Dec 18, 2023
@JesusPoderoso JesusPoderoso added the ci-pending PR which CI is running label Dec 18, 2023
@JesusPoderoso
Copy link
Contributor

I think CI issues are unrelated to the CI. In fact, it seems that some of them are failing constantly in Mac, and some others in Windows. Also, it seems GitHub Windows CI has been broken. What do you think @EduPonz @MiguelCompany ?
Leaving this PR as ready-to-merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Dec 24, 2023
@EduPonz EduPonz added ci-pending PR which CI is running and removed ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. labels Jan 10, 2024
@EduPonz
Copy link

EduPonz commented Jan 10, 2024

@richiprosima please test windows

@MiguelCompany MiguelCompany merged commit a3d74f6 into 2.11.x Jan 11, 2024
9 of 13 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.11.x/pr-4076 branch January 11, 2024 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants