Skip to content

When SHM enabled, enable transport_optimization (backport #1020) - #1022

Merged
ahcorde merged 2 commits into
kiltedfrom
mergify/bp/kilted/pr-1020
Jul 31, 2026
Merged

When SHM enabled, enable transport_optimization (backport #1020)#1022
ahcorde merged 2 commits into
kiltedfrom
mergify/bp/kilted/pr-1020

Conversation

@mergify

@mergify mergify Bot commented Jul 29, 2026

Copy link
Copy Markdown

Description

Since #857 rmw_zenoh is using the same SHM segment than created by Zenoh when transport_optimization is enabled. While it checks if transport/shared_memory/enabled==true it doesn't check nor enforce that transport/shared_memory/transport_optimization==true.
If SHM is enabled and transport_optimization is disabled, SHM is not used and rmw_zenoh fallbacks to network transport.

This PR overwrites the config with transport/shared_memory/transport_optimization: true if set to false and SHM is enabled. An INFO log is also displayed.

Is this user-facing behavior change?

No

Did you use Generative AI?

No


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

(cherry picked from commit e315985)

# Conflicts:
#	docs/design.md
@mergify mergify Bot added the conflicts label Jul 29, 2026
@mergify

mergify Bot commented Jul 29, 2026

Copy link
Copy Markdown
Author

Cherry-pick of e315985 has failed:

On branch mergify/bp/kilted/pr-1020
Your branch is up to date with 'origin/kilted'.

You are currently cherry-picking commit e315985.
  (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:   README.md
	modified:   rmw_zenoh_cpp/src/detail/rmw_context_impl_s.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/design.md

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

@mergify

mergify Bot commented Jul 29, 2026

Copy link
Copy Markdown
Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@ahcorde ahcorde left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JEnoch do you mind to take a look to the conflicts?

… branch

Signed-off-by: Julien Enoch <julien.e@zettascale.tech>
@JEnoch

JEnoch commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Pulls: #1022
Gist: https://gist.githubusercontent.com/JEnoch/e9bb9202cc5688531c7fb840d1e9fb3d/raw/531f755869c9ea799342ba89be9e643ca1d4892e/ros2.repos
BUILD args: "--continue-on-error" --packages-above-and-dependencies zenoh_cpp_vendor zenoh_security_tools rmw_zenoh_cpp
TEST args: --packages-above zenoh_cpp_vendor zenoh_security_tools rmw_zenoh_cpp
ROS Distro: kilted
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/20016

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@JEnoch
JEnoch requested a review from ahcorde July 30, 2026 11:34
@ahcorde
ahcorde merged commit b0066d2 into kilted Jul 31, 2026
5 checks passed
@ahcorde
ahcorde deleted the mergify/bp/kilted/pr-1020 branch July 31, 2026 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants