Skip to content

[24057] Reset irrelevant sequence numbers interval in proxy readers (backport #6241)#6258

Merged
MiguelCompany merged 2 commits into2.14.xfrom
mergify/bp/2.14.x/pr-6241
Jan 26, 2026
Merged

[24057] Reset irrelevant sequence numbers interval in proxy readers (backport #6241)#6258
MiguelCompany merged 2 commits into2.14.xfrom
mergify/bp/2.14.x/pr-6241

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 15, 2026

Description

Reset irrelevant sequence numbers interval in proxy readers.

@Mergifyio backport 3.4.x 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

  • N/A 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.
  • 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 #6241 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 15, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Jan 15, 2026

Cherry-pick of 61f8677 has failed:

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

You are currently cherry-picking commit 61f867715.
  (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:   src/cpp/rtps/writer/ReaderProxy.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

@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jan 15, 2026
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.14.x/pr-6241 branch from 2c34e86 to ef3fb6f Compare January 15, 2026 11:07
@MiguelCompany MiguelCompany added this to the v2.14.6 milestone Jan 15, 2026
@MiguelCompany MiguelCompany self-requested a review January 15, 2026 15:35
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 15, 2026
@emiliocuestaf emiliocuestaf self-requested a review January 20, 2026 10:47
@mergify
Copy link
Contributor Author

mergify bot commented Jan 20, 2026

🧪 CI Insights

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

❌ 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

richiware and others added 2 commits January 22, 2026 10:23
* 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>
(cherry picked from commit 61f8677)

# Conflicts:
#	test/blackbox/common/DDSBlackboxTestsContentFilter.cpp
Signed-off-by: Emilio Cuesta <emiliocuesta@eprosima.com>
@emiliocuestaf emiliocuestaf force-pushed the mergify/bp/2.14.x/pr-6241 branch from ef3fb6f to 7c6e06f Compare January 22, 2026 09:38
@emiliocuestaf emiliocuestaf self-requested a review January 22, 2026 09:38
@emiliocuestaf emiliocuestaf 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 Jan 26, 2026
@MiguelCompany MiguelCompany merged commit 5b96410 into 2.14.x Jan 26, 2026
27 of 30 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.14.x/pr-6241 branch January 26, 2026 06:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants