Skip to content
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

[humble] Allow unknown types in bag rewrite (backport #1812) #1819

Merged
merged 3 commits into from
Sep 24, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 23, 2024

This PR will allow ros2 bag convert to process bag files with "unknown" message types.
Unknown are the types which typesupport is not available during the bag conversion operation.

Also added proper handling for the ament_index_cpp::PackageNotFoundError exception throwing from the ament_index_cpp::get_package_share_directory(package);. It was causing abnormal converter or recorder termination if the package for message definition was not found in ament_index.

Signed-off-by: Michael Orlov <[email protected]>
(cherry picked from commit cd7bd63)

# Conflicts:
#	rosbag2_cpp/src/rosbag2_cpp/message_definitions/local_message_definition_source.cpp
#	rosbag2_cpp/test/rosbag2_cpp/test_local_message_definition_source.cpp
@mergify mergify bot requested a review from a team as a code owner September 23, 2024 16:02
Copy link
Author

mergify bot commented Sep 23, 2024

Cherry-pick of cd7bd63 has failed:

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

You are currently cherry-picking commit cd7bd636.
  (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:   rosbag2_transport/src/rosbag2_transport/bag_rewrite.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   rosbag2_cpp/src/rosbag2_cpp/message_definitions/local_message_definition_source.cpp
	deleted by us:   rosbag2_cpp/test/rosbag2_cpp/test_local_message_definition_source.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

@mergify mergify bot added the conflicts label Sep 23, 2024
@mergify mergify bot requested review from gbiggs and james-rms and removed request for a team September 23, 2024 16:02
@MichaelOrlov MichaelOrlov changed the title Allow unknown types in bag rewrite (backport #1812) [humble] Allow unknown types in bag rewrite (backport #1812) Sep 23, 2024
@ahcorde
Copy link
Contributor

ahcorde commented Sep 24, 2024

Pulls: #1819
Gist: https://gist.githubusercontent.com/ahcorde/4ccbe11bcf40d06d514db7a2fcc4e54b/raw/01a94c416a6c6226589f83e1fe58c2d1f809adce/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_cpp --packages-above-and-dependencies rosbag2_cpp
TEST args: --packages-above rosbag2_cpp --packages-above rosbag2_cpp
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14603

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

@ahcorde
Copy link
Contributor

ahcorde commented Sep 24, 2024

warning on windows is not related with this PR

@ahcorde ahcorde merged commit f997e40 into humble Sep 24, 2024
14 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-1812 branch September 24, 2024 15:05
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