[18966] SHM sending improvements by jsan-rt · Pull Request #3642 · eProsima/Fast-DDS

jsan-rt · 2023-06-29T15:00:26Z

Description

Improve reliability of sending data through Shared Memory by detecting and deleting stale ports and remapping them when needed. It also adds a retry when sending data in the event the port being used is found to be obsolete.

Contributor Checklist

Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
Any new/modified methods have been properly documented using Doxygen.
Changes are ABI compatible.
Changes are API compatible.
[NA] New feature has been added to the versions.md file (if applicable).
[NA] New feature has been documented/Current behavior is correctly described in the documentation.
Applicable backports have been included in the description.

Reviewer Checklist

The PR has a milestone assigned.
Check contributor checklist is correct.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

jsan-rt · 2023-07-06T08:47:11Z

@richiprosima please test this

jsan-rt · 2023-07-06T09:10:29Z

@Mergifyio backport 2.6.x 2.9.x 2.10.x

mergify · 2023-07-06T09:11:01Z

backport 2.6.x 2.9.x 2.10.x

✅ Backports have been created

Details

#3711 [18966] SHM sending improvements (backport #3642) has been created for branch 2.6.x but encountered conflicts
#3712 [18966] SHM sending improvements (backport #3642) has been created for branch 2.9.x
#3713 [18966] SHM sending improvements (backport #3642) has been created for branch 2.10.x

jsan-rt · 2023-07-07T05:09:56Z

@richiprosima please test mac test windows

src/cpp/rtps/transport/shared_mem/SharedMemManager.hpp

src/cpp/rtps/transport/shared_mem/SharedMemGlobal.hpp

test/unittest/transport/SharedMemTests.cpp

jsan-rt · 2023-07-10T20:41:50Z

@richiprosima please test mac test windows

jsan-rt · 2023-07-11T14:57:00Z

@richiprosima please test this

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

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

jsan-rt · 2023-07-12T05:54:36Z

@richiprosima please test this

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

jsan-rt · 2023-07-13T07:33:53Z

@richiprosima please test this

jsan-rt · 2023-07-13T10:34:25Z

Address Sanitizer failure is unrelated.

JLBuenoLopez

LGTM with green Mac CI

MiguelCompany · 2023-07-13T11:47:59Z

@richiprosima Please test mac

* Refs #18966. Refactor of try_push. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Retry try_push after regenerating output port. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Clean all output ports on every send. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Clean output ports when they have no listeners. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966: Applied suggestions Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Refs #18966: Uncrustify Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Refs #18966: Prevent port cleanup on Windows platforms Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Co-authored-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 2f80b06) # Conflicts: # src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp

* Refs #18966. Refactor of try_push. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Retry try_push after regenerating output port. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Clean all output ports on every send. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Clean output ports when they have no listeners. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966: Applied suggestions Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Refs #18966: Uncrustify Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Refs #18966: Prevent port cleanup on Windows platforms Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Co-authored-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 2f80b06)

* SHM sending improvements (#3642) * Refs #18966. Refactor of try_push. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Retry try_push after regenerating output port. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Clean all output ports on every send. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Clean output ports when they have no listeners. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966: Applied suggestions Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Refs #18966: Uncrustify Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Refs #18966: Prevent port cleanup on Windows platforms Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Co-authored-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 2f80b06) # Conflicts: # src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp * Fixed conflicts Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Co-authored-by: jsantiago-eProsima <90755661+jsantiago-eProsima@users.noreply.github.com> Co-authored-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #18966. Refactor of try_push. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Retry try_push after regenerating output port. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Clean all output ports on every send. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966. Clean output ports when they have no listeners. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #18966: Applied suggestions Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Refs #18966: Uncrustify Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Refs #18966: Prevent port cleanup on Windows platforms Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Co-authored-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 2f80b06) Co-authored-by: jsantiago-eProsima <90755661+jsantiago-eProsima@users.noreply.github.com>

EduPonz added this to the v2.11.1 milestone Jul 6, 2023

jsan-rt added the ci-pending PR which CI is running label Jul 6, 2023

JLBuenoLopez suggested changes Jul 10, 2023

View reviewed changes

JesusPoderoso added in progress Issue or PR which is being reviewed ci-pending PR which CI is running and removed ci-pending PR which CI is running in progress Issue or PR which is being reviewed labels Jul 11, 2023

MiguelCompany and others added 6 commits July 12, 2023 07:53

Refs #18966. Refactor of try_push.

ddb5ef1

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

Refs #18966. Retry try_push after regenerating output port.

45d97c3

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

Refs #18966. Clean all output ports on every send.

f9b8c9d

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

Refs #18966. Clean output ports when they have no listeners.

37459f9

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

Refs #18966: Applied suggestions

f110fc6

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

Refs #18966: Uncrustify

d17af2d

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

jsan-rt force-pushed the bugfix/shm/sending_improvements branch from e7532d2 to d17af2d Compare July 12, 2023 05:53

Refs #18966: Prevent port cleanup on Windows platforms

4ece80c

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

MiguelCompany added the first-to-merge label Jul 13, 2023

JLBuenoLopez approved these changes Jul 13, 2023

View reviewed changes

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 Jul 13, 2023

jsan-rt merged commit 2f80b06 into master Jul 13, 2023

jsan-rt deleted the bugfix/shm/sending_improvements branch July 13, 2023 13:28

mergify bot mentioned this pull request Jul 13, 2023

[18966] SHM sending improvements (backport #3642) #3711

Merged

This was referenced Jul 13, 2023

[18966] SHM sending improvements (backport #3642) #3712

Merged

[18966] SHM sending improvements (backport #3642) #3713

Merged

This was referenced Jul 20, 2023

the subscriber cannot receive data normally [12226] #2078

Closed

[Shared Memory] Subscriber won't reconnect after crash under specific circumstances. #2811

Closed

JLBuenoLopez mentioned this pull request Sep 13, 2023

[18317] Improve SHM zombie port detection #3509

Closed

13 tasks

Conversation

jsan-rt commented Jun 29, 2023 • edited by JLBuenoLopez Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Contributor Checklist

Reviewer Checklist

Uh oh!

jsan-rt commented Jul 6, 2023

Uh oh!

jsan-rt commented Jul 6, 2023

Uh oh!

mergify bot commented Jul 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

jsan-rt commented Jul 7, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jsan-rt commented Jul 10, 2023

Uh oh!

jsan-rt commented Jul 11, 2023

Uh oh!

jsan-rt commented Jul 12, 2023

Uh oh!

jsan-rt commented Jul 13, 2023

Uh oh!

jsan-rt commented Jul 13, 2023

Uh oh!

JLBuenoLopez left a comment

Choose a reason for hiding this comment

Uh oh!

MiguelCompany commented Jul 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jsan-rt commented Jun 29, 2023 •

edited by JLBuenoLopez

Loading

mergify bot commented Jul 6, 2023 •

edited

Loading