Skip to content

Use unique mangled names when creating Content Filter Topics (backport #762)#768

Merged
fujitatomoya merged 1 commit intohumblefrom
mergify/bp/humble/pr-762
Jun 12, 2024
Merged

Use unique mangled names when creating Content Filter Topics (backport #762)#768
fujitatomoya merged 1 commit intohumblefrom
mergify/bp/humble/pr-762

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Jun 5, 2024

This PR makes every Content Filter Name unique by adding a static atomic counter. With this change, two or more content-filtered subscriptions can be created for the same topic name.

Tests are included in the following related PRs

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario-DL <mariodominguez@eprosima.com>
(cherry picked from commit 97edce2)
@fujitatomoya
Copy link
Copy Markdown
Collaborator

CI:

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

@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Jun 6, 2024

@fujitatomoya
Copy link
Copy Markdown
Collaborator

windows failure is unrelated, https://ci.ros2.org/job/ci_windows/21957/#showFailuresLink

@fujitatomoya
Copy link
Copy Markdown
Collaborator

@clalancette

Linux-rhel full build with humble always fails with the following error, is this known issue?

17:04:53 [ 88%] Running SIP generator for qt_gui_cpp_sip Python bindings...
17:04:53 sip: /usr/lib64/python3.9/site-packages/PyQt5/bindings/QtCore/QtCoremod.sip:23: syntax error
17:04:53 Traceback (most recent call last):
17:04:53   File "/home/jenkins-agent/workspace/ci_linux-rhel/ws/install/python_qt_binding/share/python_qt_binding/cmake/sip_configure.py", line 123, in <module>
17:04:53     subprocess.check_call(cmd)
17:04:53   File "/usr/lib64/python3.9/subprocess.py", line 373, in check_call
17:04:53     raise CalledProcessError(retcode, cmd)
17:04:53 subprocess.CalledProcessError: Command '['/usr/bin/sip', '-c', '/home/jenkins-agent/workspace/ci_linux-rhel/ws/build/qt_gui_cpp/sip/qt_gui_cpp_sip', '-b', '/home/jenkins-agent/workspace/ci_linux-rhel/ws/build/qt_gui_cpp/sip/qt_gui_cpp_sip/pyqtscripting.sbf', '-I', '/usr/lib64/python3.9/site-packages/PyQt5/bindings', '-w', '-n', 'PyQt5.sip', '-t', 'Qt_5_15_0', '-t', 'WS_X11', 'qt_gui_cpp.sip']' returned non-zero exit status 1.
17:04:53 gmake[2]: *** [src/qt_gui_cpp_sip/CMakeFiles/libqt_gui_cpp_sip.dir/build.make:103: sip/qt_gui_cpp_sip/Makefile] Error 1
17:04:53 gmake[1]: *** [CMakeFiles/Makefile2:253: src/qt_gui_cpp_sip/CMakeFiles/libqt_gui_cpp_sip.dir/all] Error 2
17:04:53 gmake: *** [Makefile:146: all] Error 2

@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Jun 7, 2024

CI(retry):

  • Linux-rhel Build Status

@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Jun 10, 2024

CI( with el_release: 8):

  • Linux-rhel Build Status

Note, Humble targeted RHEL 8

@fujitatomoya
Copy link
Copy Markdown
Collaborator

@ahcorde @clalancette do you know why Linux-rhel CI is failing, i am not sure...

@clalancette
Copy link
Copy Markdown
Contributor

@ahcorde @clalancette do you know why Linux-rhel CI is failing, i am not sure...

The worker disconnected, it is running as https://ci.ros2.org/job/ci_linux-rhel/729/ now.

@fujitatomoya
Copy link
Copy Markdown
Collaborator

CI( with el_release: 8):

  • Linux-rhel Build Status

Note, Humble targeted RHEL 8

@fujitatomoya
Copy link
Copy Markdown
Collaborator

CI(--packages-select rclcpp test_rmw_implementation rmw_fastrtps_shared_cpp):

  • Linux-rhel Build Status

@fujitatomoya fujitatomoya merged commit 243cd3d into humble Jun 12, 2024
@mergify mergify bot deleted the mergify/bp/humble/pr-762 branch June 12, 2024 01:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants