Skip to content

[21959] Check if SHM transport is disabled in LARGE_DATA modes (backport #5355) #5378

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

Merged
merged 2 commits into from
Nov 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 4, 2024

Description

Compilation with FASTDDS_SHM_TRANSPORT_DISABLED should properly manage the shm transport in LARGE_DATA modes.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.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; 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 #5355 done by [Mergify](https://mergify.com).

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

mergify bot commented Nov 4, 2024

Cherry-pick of a7dfdf5 has failed:

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

You are currently cherry-picking commit a7dfdf5b4.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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

Mario-DL and others added 2 commits November 4, 2024 12:58
* Refs #21959: Check for SHM_DISABLE in large_data setup modes

Signed-off-by: Mario-DL <[email protected]>

* Refs #21959: Apply Miguels rev

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21959: Apply suggestion

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario-DL <[email protected]>
Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit a7dfdf5)

# Conflicts:
#	src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.10.x/pr-5355 branch from 3e73fae to 0e52126 Compare November 4, 2024 12:02
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Nov 4, 2024
@MiguelCompany MiguelCompany self-requested a review November 4, 2024 12:03
@github-actions github-actions bot added the ci-pending PR which CI is running label Nov 4, 2024
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 merged commit 67ce284 into 2.10.x Nov 4, 2024
15 of 18 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-5355 branch November 4, 2024 14:16
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.

2 participants