rosbag2_storage_mcap: merge into rosbag2 repo #1163

james-rms · 2022-11-17T04:25:56Z

Merges rosbag2_storage_mcap into the rosbag2 monorepo.

This PR merges the entire main branch of rosbag2_storage_mcap into rolling. Once this is approved, subsequent PRs into galactic, foxy, and humble will follow with the exact same code. The rosbag2_storage_mcap codebase is designed to be compatible with all active distributions, and we intend to keep the copies of the code in each release branch exactly the same for as long as possible.

Fixes ros-tooling/rosbag2_storage_mcap#63

amacneil · 2022-11-18T04:00:41Z

Not sure if you are planning to squash or use merge commit, but if you are going to merge and keep the history around, it might be worth doing a bulk rename of issue references in commits to link fully qualified https://github.com/ros-tooling/rosbag2_storage_mcap/issues/123 instead of just #123 (since the latter will now point to the rosbag2 repo).

MichaelOrlov

@james-rms It looks good to me among a few nitpicks.
I assume that this migration is supposed to be pretty much straight forward copy-past right?
If it was some changes in baseline files could you please highlight them in MR description?

.github/workflows/lint.yml

mcap_vendor/package.xml

rosbag2_storage_mcap/package.xml

ros-discourse · 2022-11-22T00:43:30Z

This pull request has been mentioned on ROS Discourse. There might be relevant details there:

https://discourse.ros.org/t/ros-2-tsc-meeting-minutes-2022-11-17/28457/1

rosbag2_storage_mcap/src/message_definition_cache.cpp

emersonknapp · 2022-11-23T21:19:31Z

I'd lean toward squash with a pointer to the original repo for those who want to look at the history. But, not a strong preference.

Is this actually ready for merge, or are we still doing a few things at the source? If so, should we mark this as draft for now?

.github/workflows/lint.yml

james-rms · 2022-11-24T00:33:36Z

@emersonknapp should be ready to merge now - I wanted to wait to integrate some of the most recent PRs into https://github.com/ros-tooling/rosbag2_storage-mcap , but that's done now.

Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (ros2#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0

Signed-off-by: James Smith <[email protected]>

amacneil

🚀

* rosbag2_storage_mcap: merge into ros2/rosbag2 Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (ros2#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0 * ci: include rosbag2_storage_mcap Signed-off-by: James Smith <[email protected]> * package.xml: include ROS Tooling WG maintainers Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: update readme after move Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]>

…1163) * rosbag2_storage_mcap: merge into ros2/rosbag2 Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (ros2#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0 * ci: include rosbag2_storage_mcap Signed-off-by: James Smith <[email protected]> * package.xml: include ROS Tooling WG maintainers Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: update readme after move Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]>

…os2#1163) * rosbag2_storage_mcap: merge into ros2/rosbag2 Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (ros2#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0 * ci: include rosbag2_storage_mcap Signed-off-by: James Smith <[email protected]> * package.xml: include ROS Tooling WG maintainers Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: update readme after move Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]>

MichaelOrlov · 2022-11-30T01:49:05Z

@james-rms We should have been running full CI before merge.
I hope we didn't brake anything.

… (#1189) * [backport] rosbag2_storage_mcap: merge into rosbag2 repo (#1163) * rosbag2_storage_mcap: merge into ros2/rosbag2 Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0 * ci: include rosbag2_storage_mcap Signed-off-by: James Smith <[email protected]> * package.xml: include ROS Tooling WG maintainers Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: update readme after move Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> * zstd_vendor: do not remove zstd_errors.h Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]>

… (#1189) * [backport] rosbag2_storage_mcap: merge into rosbag2 repo (#1163) * rosbag2_storage_mcap: merge into ros2/rosbag2 Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0 * ci: include rosbag2_storage_mcap Signed-off-by: James Smith <[email protected]> * package.xml: include ROS Tooling WG maintainers Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: update readme after move Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> * zstd_vendor: do not remove zstd_errors.h Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> (cherry picked from commit 953c8ed) # Conflicts: # .github/workflows/test.yml

… (#1189) * [backport] rosbag2_storage_mcap: merge into rosbag2 repo (#1163) * rosbag2_storage_mcap: merge into ros2/rosbag2 Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0 * ci: include rosbag2_storage_mcap Signed-off-by: James Smith <[email protected]> * package.xml: include ROS Tooling WG maintainers Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: update readme after move Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> * zstd_vendor: do not remove zstd_errors.h Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> (cherry picked from commit 953c8ed) Signed-off-by: James Smith <[email protected]>

* rosbag2_storage_mcap: merge into ros2/rosbag2 Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (ros2#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0 * ci: include rosbag2_storage_mcap Signed-off-by: James Smith <[email protected]> * package.xml: include ROS Tooling WG maintainers Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: update readme after move Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> Signed-off-by: Ricardo Manríquez <[email protected]>

ros-discourse · 2022-12-19T18:39:08Z

This pull request has been mentioned on ROS Discourse. There might be relevant details there:

https://discourse.ros.org/t/ros-2-tsc-meeting-minutes-2022-12-15/28840/1

… (#1189) * [backport] rosbag2_storage_mcap: merge into rosbag2 repo (#1163) * rosbag2_storage_mcap: merge into ros2/rosbag2 Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0 * ci: include rosbag2_storage_mcap Signed-off-by: James Smith <[email protected]> * package.xml: include ROS Tooling WG maintainers Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: update readme after move Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> * zstd_vendor: do not remove zstd_errors.h Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> (cherry picked from commit 953c8ed) Signed-off-by: James Smith <[email protected]>

…#1198) * [Humble backport] rosbag2_storage_mcap: merge into rosbag2 repo (#1163) (#1189) * [backport] rosbag2_storage_mcap: merge into rosbag2 repo (#1163) * rosbag2_storage_mcap: merge into ros2/rosbag2 Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0 * ci: include rosbag2_storage_mcap Signed-off-by: James Smith <[email protected]> * package.xml: include ROS Tooling WG maintainers Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: update readme after move Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> * zstd_vendor: do not remove zstd_errors.h Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]> (cherry picked from commit 953c8ed) Signed-off-by: James Smith <[email protected]> * rosbag2_storage_mcap: foxy now creates bag dir Signed-off-by: James Smith <[email protected]> * Use mcap tarball rather than git clone (#1200) This avoids git lfs quota issues Signed-off-by: Michael Carroll <[email protected]> Signed-off-by: Michael Carroll <[email protected]> * mcap_vendor: install only public headers Signed-off-by: James Smith <[email protected]> move --------- Signed-off-by: James Smith <[email protected]> Signed-off-by: Michael Carroll <[email protected]> Co-authored-by: james-rms <[email protected]> Co-authored-by: Michael Carroll <[email protected]>

…#1163) (#1198)" This reverts commit e457d92.

…#1163) (#1198)" This reverts commit e457d92. Signed-off-by: Michael Orlov <[email protected]>

…#1163) (#1198)" (#1347) This reverts commit e457d92. Signed-off-by: Michael Orlov <[email protected]>

james-rms force-pushed the jrms/merge-rosbag2-storage-mcap branch 2 times, most recently from c2a4354 to c5354bb Compare November 17, 2022 04:42

james-rms changed the title ~~Jrms/merge rosbag2 storage mcap~~ rosbag2_storage_mcap: merge into rosbag2 repo Nov 17, 2022

james-rms marked this pull request as ready for review November 17, 2022 04:57

james-rms requested a review from a team as a code owner November 17, 2022 04:57

james-rms requested review from emersonknapp and MichaelOrlov and removed request for a team November 17, 2022 04:57

james-rms force-pushed the jrms/merge-rosbag2-storage-mcap branch 3 times, most recently from c6a1403 to 02c2200 Compare November 17, 2022 21:08

emersonknapp self-assigned this Nov 17, 2022

james-rms force-pushed the jrms/merge-rosbag2-storage-mcap branch 3 times, most recently from d1a3c49 to 6248196 Compare November 18, 2022 05:30

jtbandes mentioned this pull request Nov 18, 2022

Fix compile flags to work on rosbag_storage:0.17.x ros-tooling/rosbag2_storage_mcap#78

Merged

MichaelOrlov reviewed Nov 19, 2022

View reviewed changes

.github/workflows/lint.yml Outdated Show resolved Hide resolved

mcap_vendor/package.xml Show resolved Hide resolved

rosbag2_storage_mcap/package.xml Show resolved Hide resolved

MichaelOrlov reviewed Nov 22, 2022

View reviewed changes

rosbag2_storage_mcap/src/message_definition_cache.cpp Outdated Show resolved Hide resolved

emersonknapp reviewed Nov 23, 2022

View reviewed changes

.github/workflows/lint.yml Show resolved Hide resolved

james-rms force-pushed the jrms/merge-rosbag2-storage-mcap branch 3 times, most recently from 4b0795c to 437ae3c Compare November 24, 2022 00:22

james-rms force-pushed the jrms/merge-rosbag2-storage-mcap branch from 17a406e to e91a3e5 Compare November 24, 2022 00:35

amacneil mentioned this pull request Nov 27, 2022

Add integration test for mcap storage plugin #1185

Closed

james-rms added 2 commits November 29, 2022 09:05

rosbag2_storage_mcap: merge into ros2/rosbag2

e8a08b0

Signed-off-by: James Smith <[email protected]> mcap_storage: 'none' is a valid storage preset profile (ros2#86) Signed-off-by: James Smith <[email protected]> bloom: add changelog changes 0.6.0

ci: include rosbag2_storage_mcap

7aefd2c

Signed-off-by: James Smith <[email protected]>

rosbag2_storage_mcap: update readme after move

f538685

Signed-off-by: James Smith <[email protected]>

james-rms force-pushed the jrms/merge-rosbag2-storage-mcap branch from e91a3e5 to f538685 Compare November 28, 2022 22:05

james-rms mentioned this pull request Nov 29, 2022

ros2bag: test that all storage plugins can record with default args #1186

Closed

jhurliman approved these changes Nov 29, 2022

View reviewed changes

emersonknapp self-requested a review November 29, 2022 02:05

emersonknapp approved these changes Nov 29, 2022

View reviewed changes

amacneil approved these changes Nov 29, 2022

View reviewed changes

This was referenced Nov 29, 2022

fix: ignore include order ros-tooling/rosbag2_storage_mcap#38

Closed

Recursively Search for .msg files ros-tooling/rosbag2_storage_mcap#77

Closed

james-rms merged commit a9db795 into ros2:rolling Nov 29, 2022

james-rms deleted the jrms/merge-rosbag2-storage-mcap branch November 29, 2022 05:08

james-rms mentioned this pull request Nov 29, 2022

[Humble backport] rosbag2_storage_mcap: merge into rosbag2 repo (#1163) #1189

Merged

rshanor mentioned this pull request May 17, 2023

Broken regex check for SequentialWriter after MCAP merge #1336

Closed

MichaelOrlov pushed a commit that referenced this pull request May 24, 2023

Revert "[Foxy] rosbag2_storage_mcap: merge into rosbag2 repo (backport …

8a00c97

…#1163) (#1198)" This reverts commit e457d92.

MichaelOrlov pushed a commit that referenced this pull request May 24, 2023

Revert "[Foxy] rosbag2_storage_mcap: merge into rosbag2 repo (backport …

4eac1b6

…#1163) (#1198)" This reverts commit e457d92. Signed-off-by: Michael Orlov <[email protected]>

MichaelOrlov pushed a commit that referenced this pull request May 26, 2023

Revert "[Foxy] rosbag2_storage_mcap: merge into rosbag2 repo (backport …

c28cfd6

…#1163) (#1198)" This reverts commit e457d92. Signed-off-by: Michael Orlov <[email protected]>

MichaelOrlov pushed a commit that referenced this pull request May 26, 2023

Revert "[Foxy] rosbag2_storage_mcap: merge into rosbag2 repo (backport …

5a0ecf0

…#1163) (#1198)" This reverts commit e457d92. Signed-off-by: Michael Orlov <[email protected]>

MichaelOrlov pushed a commit that referenced this pull request May 26, 2023

Revert "[Foxy] rosbag2_storage_mcap: merge into rosbag2 repo (backport …

67e2ebf

…#1163) (#1198)" (#1347) This reverts commit e457d92. Signed-off-by: Michael Orlov <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rosbag2_storage_mcap: merge into rosbag2 repo #1163

rosbag2_storage_mcap: merge into rosbag2 repo #1163

james-rms commented Nov 17, 2022 •

edited

Loading

amacneil commented Nov 18, 2022

MichaelOrlov left a comment

ros-discourse commented Nov 22, 2022

emersonknapp commented Nov 23, 2022

james-rms commented Nov 24, 2022

amacneil left a comment

MichaelOrlov commented Nov 30, 2022

ros-discourse commented Dec 19, 2022

rosbag2_storage_mcap: merge into rosbag2 repo #1163

rosbag2_storage_mcap: merge into rosbag2 repo #1163

Conversation

james-rms commented Nov 17, 2022 • edited Loading

amacneil commented Nov 18, 2022

MichaelOrlov left a comment

Choose a reason for hiding this comment

ros-discourse commented Nov 22, 2022

emersonknapp commented Nov 23, 2022

james-rms commented Nov 24, 2022

amacneil left a comment

Choose a reason for hiding this comment

MichaelOrlov commented Nov 30, 2022

ros-discourse commented Dec 19, 2022

james-rms commented Nov 17, 2022 •

edited

Loading