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

Merged
merged 2 commits into from
Aug 1, 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.
Cherry-pick of 7cf43a6 has failed:

On branch mergify/bp/2.6.x/pr-3759
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 7cf43a62c.
  (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:   src/cpp/rtps/DataSharing/DataSharingListener.cpp
	modified:   src/cpp/rtps/DataSharing/DataSharingNotification.hpp
	modified:   src/cpp/rtps/transport/shared_mem/SharedMemManager.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/shared_mem/SharedMemGlobal.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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 <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

* Refs #19255. Catch lock timeout on SharedMemGlobal.

Signed-off-by: Miguel Company <[email protected]>

* Refs #19255. Please linters.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 7cf43a6)

# Conflicts:
#	src/cpp/rtps/transport/shared_mem/SharedMemGlobal.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jul 31, 2023
@MiguelCompany MiguelCompany added this to the v2.6.6 milestone Jul 31, 2023
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jul 31, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Jul 31, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit df904f3 into 2.6.x Aug 1, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-3759 branch August 1, 2023 15:55
@MiguelCompany MiguelCompany 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 Aug 1, 2023
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.

1 participant