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) #4165

Merged
merged 1 commit into from
Jan 27, 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 the ci-pending PR which CI is running label Dec 18, 2023
@JesusPoderoso JesusPoderoso added this to the v2.12.2 milestone Dec 18, 2023
@elianalf
Copy link
Contributor

@richiprosima please test windows

@elianalf
Copy link
Contributor

@richiprosima please test mac

3 similar comments
@elianalf
Copy link
Contributor

@richiprosima please test mac

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@elianalf
Copy link
Contributor

elianalf commented Jan 3, 2024

@richiprosima please test mac

@elianalf
Copy link
Contributor

elianalf commented Jan 3, 2024

Mac CI manually rerun, built and passed the tests, except for LogTests.flush_n. (http://jenkins.eprosima.com:8080/job/fastdds_mac/4914/). LGTM

@elianalf elianalf 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 Jan 3, 2024
@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 11, 2024
@EduPonz
Copy link

EduPonz commented Jan 11, 2024

@richiprosima please test mac

2 similar comments
@EduPonz
Copy link

EduPonz commented Jan 12, 2024

@richiprosima please test mac

@Mario-DL
Copy link
Member

@richiprosima please test mac

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac 🥲

@JesusPoderoso
Copy link
Contributor

Mac CI issues unrelated to this backport. 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 Jan 23, 2024
@EduPonz EduPonz merged commit db0bc06 into 2.12.x Jan 27, 2024
12 of 13 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.12.x/pr-4076 branch January 27, 2024 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants