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/3.2.x/pr-6181
Your branch is up to date with 'origin/3.2.x'.

You are currently cherry-picking commit 062258c8.
  (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:   examples/cpp/content_filter/SubscriberApp.hpp
	modified:   src/cpp/rtps/writer/ReaderProxy.cpp
	modified:   src/cpp/rtps/writer/ReaderProxy.hpp
	modified:   src/cpp/rtps/writer/StatefulWriter.cpp
	modified:   src/cpp/rtps/writer/StatefulWriter.hpp
	modified:   test/dds/xtypes/TypeLookupServiceSubscriber.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/DDSBlackboxTestsContentFilter.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

…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>
(cherry picked from commit 062258c)

# Conflicts:
#	test/blackbox/common/DDSBlackboxTestsContentFilter.cpp
* Refs #24038. Regression test

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

* Refs #24038. Fix

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

* Refs #24038. Apply suggestion

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

* Refs #24038. Apply new uncrustify

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

---------

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/3.2.x/pr-6181 branch from efa40d1 to e1ac005 Compare January 15, 2026 11:00
@MiguelCompany MiguelCompany self-requested a review January 15, 2026 11:00
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 15, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Jan 15, 2026

🧪 CI Insights

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

❌ Job Failures

Pipeline Job Health on 3.2.x Retries 🔍 CI Insights 📄 Logs
Fast DDS Linters CI uncrustify Unknown 0 View View
Fast DDS MacOS CI mac-ci / fastdds_test () Unknown 0 View View
Fast DDS Sanitizers CI sanitizers-ci / asan_fastdds_test Unknown 1 View View
Fast DDS Ubuntu CI ubuntu-ci / fastdds_python_test (RelWithDebInfo) Unknown 1 View View
ubuntu-ci / fastdds_test (RelWithDebInfo) Unknown 1 View View

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