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

Fix resetting of LivelinessLostStatus::total_changes [14984] #2782

Merged
merged 2 commits into from
Jul 13, 2022

Conversation

richiware
Copy link
Member

@richiware richiware commented Jun 27, 2022

Description

RTPS layer always reset LivelinessLostStatus::total_changes after calling the on_liveliness_lost() listener callback.
This PR fixes this adding its own LivelinessLostStatus to DataWriterImpl.

@Mergifyio backport 2.5.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • n/a Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added.
  • n/a 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.

@richiware richiware changed the title Fix resetting of LivelinessLostStatus::total_changes Fix resetting of LivelinessLostStatus::total_changes [14984] Jun 27, 2022
@EduPonz EduPonz added this to the v2.7.0 milestone Jun 28, 2022
src/cpp/fastdds/publisher/DataWriterImpl.cpp Outdated Show resolved Hide resolved
src/cpp/fastdds/publisher/DataWriterImpl.cpp Outdated Show resolved Hide resolved
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
@MiguelCompany MiguelCompany modified the milestones: v2.7.0, v2.7.1 Jul 1, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit b5f87dd into master Jul 13, 2022
@MiguelCompany MiguelCompany deleted the bugfix/14982 branch July 13, 2022 05:26
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.6.x 2.3.x 2.1.x

mergify bot pushed a commit that referenced this pull request Jul 13, 2022
* Refs #14982. Fix `DataWriter::get_liveliness_lost_status()`

* Apply suggestions from code review

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
(cherry picked from commit b5f87dd)
mergify bot pushed a commit that referenced this pull request Jul 13, 2022
* Refs #14982. Fix `DataWriter::get_liveliness_lost_status()`

* Apply suggestions from code review

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
(cherry picked from commit b5f87dd)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.cpp
mergify bot pushed a commit that referenced this pull request Jul 13, 2022
* Refs #14982. Fix `DataWriter::get_liveliness_lost_status()`

* Apply suggestions from code review

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
(cherry picked from commit b5f87dd)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.cpp
@mergify
Copy link
Contributor

mergify bot commented Jul 13, 2022

backport 2.6.x 2.3.x 2.1.x

✅ Backports have been created

JLBuenoLopez pushed a commit that referenced this pull request Jul 21, 2022
* Refs #14982. Fix `DataWriter::get_liveliness_lost_status()`

* Apply suggestions from code review

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
(cherry picked from commit b5f87dd)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.cpp
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
JLBuenoLopez pushed a commit that referenced this pull request Jul 21, 2022
* Refs #14982. Fix `DataWriter::get_liveliness_lost_status()`

* Apply suggestions from code review

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
(cherry picked from commit b5f87dd)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.cpp
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Jul 21, 2022
* Fix resetting of `LivelinessLostStatus::total_changes` (#2782)

* Refs #14982. Fix `DataWriter::get_liveliness_lost_status()`

* Apply suggestions from code review

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
(cherry picked from commit b5f87dd)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.cpp
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #15163: fix conflicts

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

Co-authored-by: Ricardo González <ricardo@richiware.dev>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Jul 22, 2022
* Fix resetting of `LivelinessLostStatus::total_changes` (#2782)

* Refs #14982. Fix `DataWriter::get_liveliness_lost_status()`

* Apply suggestions from code review

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
(cherry picked from commit b5f87dd)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.cpp
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #15160: fix conflicts

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

Co-authored-by: Ricardo González <ricardo@richiware.dev>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants