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.

Sign up for GitHub

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

Jump to bottom

[15915] Send GAPs correctly when using separate sending #3012

Merged
merged 8 commits into from
Oct 25, 2022
Merged

[15915] Send GAPs correctly when using separate sending #3012

merged 8 commits into from
Oct 25, 2022

Conversation

jsan-rt
Copy link
Contributor

@jsan-rt jsan-rt commented Oct 14, 2022 •
edited by EduPonz
Loading

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

Description

When using separate sending, in the event of a change with a sequence number lower than the last one being no longer available in the Writer History a GAP was not being properly sent. This leads to the Reader and Writer being stuck on a cycle of HEARTBEATs and ACKNACKs that request the missing change.

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.
  • Any new/modified methods have been properly documented using Doxygen.
  • Fast DDS test suite has been run locally.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A Documentation builds and tests pass locally.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

Reviewer Checklist

  • 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 jsan-rt marked this pull request as ready for review October 16, 2022 19:23
@jsan-rt
Copy link
Contributor Author

jsan-rt commented Oct 16, 2022

@richiprosima please test this

@jsan-rt
Copy link
Contributor Author

jsan-rt commented Oct 17, 2022

@richiprosima please test this again

MiguelCompany
MiguelCompany requested changes Oct 21, 2022
View reviewed changes
src/cpp/rtps/writer/StatefulWriter.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/writer/StatefulWriter.cpp Outdated Show resolved Hide resolved
@jsan-rt
Copy link
Contributor Author

jsan-rt commented Oct 23, 2022

@richiprosima please test this again

MiguelCompany
MiguelCompany requested changes Oct 24, 2022
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the warnings on Windows, changes LGTM

@jsan-rt
Refs #15915: Added test and error trace
c30f9c6 
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt
Refs #15915: Disabled for intraprocess
235b133 
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt
Refs #15915: Added new gap requirement check when using separate sending
7684583 
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt
Refs #15915: Changed the test from a parametrized test to a standalon…
4e2e035 
…e test

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt
Refs #15915: Added review suggestions
dee55f0 
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt
Refs #15915: Fixed Windows warnings
ad24b9e 
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt jsan-rt force-pushed the bugfix/unsent_gap_separate_sending branch from aba42dc to ad24b9e Compare October 24, 2022 06:32
@jsan-rt
Copy link
Contributor Author

jsan-rt commented Oct 24, 2022

@richiprosima please test windows

@jsan-rt
Refs #15915: Added doxygen. Re-added removed assertion
38f471b 
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

MiguelCompany
MiguelCompany previously approved these changes Oct 24, 2022
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Oct 24, 2022
@MiguelCompany MiguelCompany added this to the v2.8.1 milestone Oct 24, 2022
@jsan-rt
Refs #15915: Removed unused variables
8a0d79c 
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt
Copy link
Contributor Author

jsan-rt commented Oct 24, 2022

@richiprosima please test mac

@MiguelCompany
Copy link
Member

@richiprosima Please test this

@EduPonz
Copy link

EduPonz commented Oct 25, 2022

@Mergifyio backport 2.7.x 2.6.x

@EduPonz EduPonz merged commit 0344ce1 into master Oct 25, 2022
@EduPonz EduPonz deleted the bugfix/unsent_gap_separate_sending branch October 25, 2022 06:08
@mergify mergify bot mentioned this pull request Oct 25, 2022
Merged
mergify bot pushed a commit that referenced this pull request Oct 25, 2022
@jsan-rt @mergify
Send GAPs correctly when using separate sending (#3012)
4986a45 
* Refs #15915: Added test and error trace

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

* Refs #15915: Disabled for intraprocess

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

* Refs #15915: Added new gap requirement check when using separate sending

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

* Refs #15915: Changed the test from a parametrized test to a standalone test

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

* Refs #15915: Added review suggestions

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

* Refs #15915: Fixed Windows warnings

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

* Refs #15915: Added doxygen. Re-added removed assertion

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

* Refs #15915: Removed unused variables

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

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
(cherry picked from commit 0344ce1)
@mergify mergify bot mentioned this pull request Oct 25, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Oct 25, 2022

backport 2.7.x 2.6.x

✅ Backports have been created

@MiguelCompany
Copy link
Member

@Mergifyio backport 2.6.x

@mergify
Copy link
Contributor

mergify bot commented Oct 25, 2022

backport 2.6.x

✅ Backports have been created

MiguelCompany pushed a commit that referenced this pull request Oct 25, 2022
@jsan-rt @MiguelCompany
Send GAPs correctly when using separate sending (#3012)
48ff66a 
* Refs #15915: Added test and error trace

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

* Refs #15915: Disabled for intraprocess

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

* Refs #15915: Added new gap requirement check when using separate sending

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

* Refs #15915: Changed the test from a parametrized test to a standalone test

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

* Refs #15915: Added review suggestions

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

* Refs #15915: Fixed Windows warnings

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

* Refs #15915: Added doxygen. Re-added removed assertion

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

* Refs #15915: Removed unused variables

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

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany left review comments

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v2.8.1
Development

Successfully merging this pull request may close these issues.
3 participants
@jsan-rt @MiguelCompany @EduPonz