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] When using sim time, wait for /clock before beginning recording (backport #1378) #1392

Merged
merged 6 commits into from
Jun 14, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 12, 2023

Depends on ros2/rcl#1078
Depends on ros2/rclcpp#2210

This is an automatic backport of pull request #1378 done by Mergify.
Cherry-pick of d52ddbb has failed:

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

You are currently cherry-picking commit d52ddbb.
  (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:   rosbag2_transport/test/rosbag2_transport/test_record_all_use_sim_time.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ros2bag/ros2bag/verb/record.py
	both modified:   rosbag2_transport/src/rosbag2_transport/recorder.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* When using sim time, wait for /clock before beginning recording
* Disable use-sim-time && no-discovery combo, allow re-enabling discovery after stop()

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
(cherry picked from commit d52ddbb)

# Conflicts:
#	ros2bag/ros2bag/verb/record.py
#	rosbag2_transport/src/rosbag2_transport/recorder.cpp
@mergify mergify bot requested a review from a team as a code owner June 12, 2023 19:49
@mergify mergify bot requested review from MichaelOrlov and jhdcs and removed request for a team June 12, 2023 19:49
@mergify mergify bot added the conflicts label Jun 12, 2023
@emersonknapp emersonknapp self-assigned this Jun 12, 2023
@emersonknapp emersonknapp force-pushed the mergify/bp/humble/pr-1378 branch from 9d6c515 to cb7b4da Compare June 12, 2023 21:33
Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
@emersonknapp emersonknapp force-pushed the mergify/bp/humble/pr-1378 branch from cb7b4da to 515df43 Compare June 12, 2023 21:34
@emersonknapp
Copy link
Collaborator

@ros-pull-request-builder retest this please

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
@emersonknapp
Copy link
Collaborator

Requires ros2/rclcpp#2040 - discussing on the issue whether we can backport it to Humble. If not, I can do an "inline cherry-pick" of the needed functions into recorder.cpp in a private namespace for use.

…p as proposal.

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
@emersonknapp emersonknapp force-pushed the mergify/bp/humble/pr-1378 branch from 5f4ab86 to 940c12c Compare June 12, 2023 23:55
@emersonknapp emersonknapp changed the title When using sim time, wait for /clock before beginning recording (backport #1378) [humble] When using sim time, wait for /clock before beginning recording (backport #1378) Jun 12, 2023
@emersonknapp emersonknapp added humble Humble Hawksbill and removed conflicts labels Jun 12, 2023
Copy link
Contributor

@MichaelOrlov MichaelOrlov left a comment

Choose a reason for hiding this comment

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

Backport LGTM among one nitpick with missed timeout parameter.

…, just up as proposal."

This reverts commit 940c12c.

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
@emersonknapp
Copy link
Collaborator

Backports created ros2/rcl#1078, ros2/rclcpp#2210 and approved, running CI. I will wait on those instead of copying the code here

@emersonknapp
Copy link
Collaborator

Pulls: #1392
Gist: https://gist.githubusercontent.com/emersonknapp/e38a6e3aa008d4b5c171281ea1a088e2/raw/b1f79db16902002588826c2c13b9c734e1f8cd87/ros2.repos
BUILD args: --packages-above-and-dependencies ros2bag rosbag2_transport
TEST args: --packages-above ros2bag rosbag2_transport
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/12241

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

@emersonknapp emersonknapp merged commit 03aba85 into humble Jun 14, 2023
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-1378 branch June 14, 2023 23:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Humble Hawksbill
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants