Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 26, 2025

Description

When Content Filter is being performed on the writer side, and samples are always irrelevant for all readers, currently a heartbeat period is received without notification of the previous GAP sequence of samples, and the readers annotate those samples as lost. This PR fixes this, ensuring that a GAP message is sent before the HEARTBEAT period or before a DATA for one of the readers.

@Mergifyio backport 3.3.x 3.2.x 2.14.x

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.

  • N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • 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.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • N/A: If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #6181 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Nov 26, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 26, 2025

Cherry-pick of 062258c has failed:

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

You are currently cherry-picking commit 062258c8c.
  (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:   .github/workflows/reusable-sanitizers-ci.yml
	modified:   include/fastdds/rtps/writer/ReaderProxy.h
	modified:   include/fastdds/rtps/writer/StatefulWriter.h
	modified:   src/cpp/rtps/writer/ReaderProxy.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   examples/cpp/content_filter/SubscriberApp.hpp
	both modified:   src/cpp/rtps/writer/StatefulWriter.cpp
	both modified:   test/blackbox/common/DDSBlackboxTestsContentFilter.cpp
	deleted by us:   test/dds/xtypes/TypeLookupServiceSubscriber.cpp

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

@MiguelCompany MiguelCompany added this to the v2.14.6 milestone Nov 26, 2025
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.14.x/pr-6181 branch from 154951b to fc8c782 Compare December 1, 2025 15:29
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Dec 1, 2025
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.14.x/pr-6181 branch from fc8c782 to 3120c2f Compare December 1, 2025 15:30
@MiguelCompany MiguelCompany self-requested a review December 1, 2025 15:30
@github-actions github-actions bot added the ci-pending PR which CI is running label Dec 1, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Dec 1, 2025

🧪 CI Insights

Here's what we observed from your CI run for 3120c2f.

❌ Job Failures

Pipeline Job Health on 2.14.x Retries 🔍 CI Insights 📄 Logs
Fast-DDS MacOS CI mac-ci / fastdds_test () Unknown 0 View View
Fast-DDS Ubuntu CI ubuntu-ci / fastdds_alternative_builds (RelWithDebInfo) Unknown 0 View View

@MiguelCompany
Copy link
Member

@Mergifyio rebase

…DATA (#6181)

* Refs #23919. Tests

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #23919. Fix

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #23919. Fix cornercase

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #23919. Apply suggestions

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #23919. Fix jobs needs log

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #23919. Apply suggestions

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

---------

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
@mergify
Copy link
Contributor Author

mergify bot commented Dec 3, 2025

rebase

✅ Branch has been successfully rebased

@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.14.x/pr-6181 branch from 3120c2f to da2242e Compare December 3, 2025 14:24
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany December 3, 2025 14:25
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.

3 participants