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

Improve SHM resilience to crashing participants (backport #3759) #3763

Merged
merged 1 commit into from
Aug 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 31, 2023

This is an automatic backport of pull request #3759 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

* Refs #19255. Always pop descriptor from SHM port.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #19255. Catch lock timeout on DataSharing notifications.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #19255. Catch lock timeout on SharedMemGlobal.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #19255. Please linters.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 7cf43a6)
@MiguelCompany MiguelCompany added this to the v2.11.2 milestone Jul 31, 2023
@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Jul 31, 2023
@MiguelCompany MiguelCompany merged commit dc87485 into 2.11.x Aug 7, 2023
5 of 6 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.11.x/pr-3759 branch August 7, 2023 08:14
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.

1 participant