-
Notifications
You must be signed in to change notification settings - Fork 251
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
Install signal handlers in recorder only inside record method #1464
Install signal handlers in recorder only inside record method #1464
Conversation
Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
ff476d4
to
d950c67
Compare
@tonynajjar Please review. |
I cherrypicked and tested it on iron and it works as intended 👍 I'd appreciate a backport of this to iron when merged 🙏 |
Correction, now exiting works if we are not recording but if CTRL-C is pressed while recording then the node still doesn't exit |
@tonynajjar Can you please double-check or clarify how are you reproducing failure rosbag2/rosbag2_tests/test/rosbag2_tests/test_rosbag2_record_end_to_end.cpp Lines 170 to 198 in 777612f
and record_end_to_end_exits_gracefully_on_sigterm rosbag2/rosbag2_tests/test/rosbag2_tests/test_rosbag2_record_end_to_end.cpp Lines 200 to 216 in 777612f
|
@tonynajjar Friendly ping on the question in this pull request ^^^ |
Here is an example code purely for reproduction purposes: from rosbag2_py import Recorder, RecordOptions, StorageOptions
import time
import rclpy
from rclpy.node import Node
class RosBagRecorder(Node):
def __init__(self):
super().__init__("rosbag_recorder")
storage_options = StorageOptions(
uri=f"/tmp/{time.strftime('%Y-%m-%d-%H-%M-%S')}.mcap",
storage_id="mcap",
)
record_options = RecordOptions()
record_options.all = True
recorder = Recorder()
print("created recorder")
time.sleep(3)
recorder.record(storage_options, record_options)
def main():
rclpy.init()
node = RosBagRecorder()
rclpy.spin(node)
if __name__ == "__main__":
main() I you run this node as part of a launch file and do CTRL-C while it's recording then we get:
It shows that when CTRL-C (^C), was pressed, the recording indeed stopped but not the node. The launch had to resort to sending SIGTERM after 5 seconds to shutdown the node properly which is not ideal |
@tonynajjar Thanks for providing a reproducer and sorry for the delay. |
@tonynajjar The problem is not in the rosbag2 recorder but rather in the way how you are trying to use it. But this is a wrong approach. rosbag2/rosbag2_py/src/rosbag2_py/_transport.cpp Lines 225 to 248 in d950c67
What happened in your reproducer is the following:
Please note that the composable rosbag2 recorder and player are not supported yet and this feature is still WIP Make Player and Recorder Composable (#902) #1419 |
@clalancette May I have approval for this PR? |
Hello @MichaelOrlov, can you give me a minimal example of a correct approach? Basically I need a node with a service server whose callback starts recording a bag using the Recorder. I need to spin the external node so that the service server works, how else would you do it? |
See
Just remove those |
But then the service server callback would not be called (not shown in code) |
@tonynajjar I can't comment on what is not included in the minimum valuable reproducer. With the provided minimum valuable reproducer removing |
@clalancette @fujitatomoya I would appreciate a review and approval of this PR. |
@clalancette @fujitatomoya Friendly ping for review. |
@tonynajjar just a comment. IMO, i agree that it makes sense to manage |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as described in #1464 (comment), there would be more user-friendly enhancement for rosbag2_py::Recorder
, but that can be categorized as an another topic. lgtm for this fix.
Gist: https://gist.githubusercontent.com/MichaelOrlov/c860b7642218ea1655d1b603c91a9ff7/raw/42757621600bdaf3d7e3c479b7c313022320fc3a/ros2.repos |
@clalancette @emersonknapp Could you please formally approve this PR to be able to merge it? |
https://github.com/Mergifyio backport iron humble |
✅ Backports have been created
|
Signed-off-by: Michael Orlov <michael.orlov@apex.ai> (cherry picked from commit 195e406) # Conflicts: # rosbag2_py/src/rosbag2_py/_transport.cpp
Signed-off-by: Michael Orlov <michael.orlov@apex.ai> (cherry picked from commit 195e406)
…d (backport #1464) (#1526) * Install signal handlers in recorder only inside record method (#1464) Signed-off-by: Michael Orlov <michael.orlov@apex.ai> (cherry picked from commit 195e406) # Conflicts: # rosbag2_py/src/rosbag2_py/_transport.cpp * Address merge conflicts Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Michael Orlov <michael.orlov@apex.ai>
* Link and compile against rosbag2_storage_mcap: Fixed issue 1492 (#1496) (#1498) Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com> (cherry picked from commit 7fcb703) Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com> * [humble] Bugfix for incorrect playback rate changes when pressing buttons (backport #1513) (#1515) * Bugfix for incorrect playback rate changes when pressing buttons (#1513) - Playback rate expected to be changed by 10% with each increase/decrease step. - Use +0.1 and -0.1 in decrease/increase rate formula instead of multiply by factor of the 1.1 and 0.9 respectively. Signed-off-by: Michael Orlov <michael.orlov@apex.ai> (cherry picked from commit 95f78b6) # Conflicts: # rosbag2_transport/src/rosbag2_transport/player.cpp * Address merge conflicts after auto-backporting Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> * call cv.wait_until only if necessary. (#1521) (#1523) * call cv.wait_until only if necessary. Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> * add comment to avoid extra delay for performance. Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> --------- Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> (cherry picked from commit a16704b) Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com> * [humble] Install signal handlers in recorder only inside record method (backport #1464) (#1526) * Install signal handlers in recorder only inside record method (#1464) Signed-off-by: Michael Orlov <michael.orlov@apex.ai> (cherry picked from commit 195e406) # Conflicts: # rosbag2_py/src/rosbag2_py/_transport.cpp * Address merge conflicts Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> * [humble] `Recording stopped` prints only once. (backport #1530) (#1535) * `Recording stopped` prints only once. (#1530) Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> (cherry picked from commit 73b0772) # Conflicts: # rosbag2_transport/src/rosbag2_transport/recorder.cpp * Address merge conflicts Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> * [humble] Give proper log message for `--start-paused` (backport #1537) (#1541) * Add proper message for --start-paused (#1537) Signed-off-by: Christoph Froehlich <christoph.froehlich@ait.ac.at> (cherry picked from commit 317286c) # Conflicts: # rosbag2_transport/src/rosbag2_transport/recorder.cpp * Address merge conflicts Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> * 0.15.9 (#1551) * 0.15.9 Signed-off-by: Audrow Nash <audrow@intrinsic.ai> * Update rosbag2_transport/CHANGELOG.rst Co-authored-by: Michael Orlov <michael.orlov@apex.ai> Signed-off-by: Audrow Nash <audrow@intrinsic.ai> --------- Signed-off-by: Audrow Nash <audrow@intrinsic.ai> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> * [humble] Add default initialization for CompressionOptions (backport #1539) (#1546) * Add default initialization for CompressionOptions (#1539) * feat: add sane defaults for CompressionOptions Signed-off-by: Arne Böckmann <a.boeckmann@cellumation.com> * Update rosbag2_compression/include/rosbag2_compression/compression_options.hpp Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com> Signed-off-by: Arne Böckmann <a.boeckmann@cellumation.com> --------- Signed-off-by: Arne Böckmann <a.boeckmann@cellumation.com> Co-authored-by: Arne Böckmann <a.boeckmann@cellumation.com> Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com> (cherry picked from commit 931bf54) # Conflicts: # rosbag2_compression/include/rosbag2_compression/compression_options.hpp * Address merge conflicts Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Arne B <arne@rnae.de> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> * Fix/zstd vendor does not find system zstd (#1111) (#1560) cmake did not find the Findzstd.cmake in cmake/Modules Since we cannot use pkg-config for some Windows issues, the parsing of the version is done by looking for the string in zstd.h. Signed-off-by: Matthias Schoepfer <m.schoepfer@rethinkrobotics.com> (cherry picked from commit e7e7269) Co-authored-by: DasRoteSkelett <matthias.schoepfer@googlemail.com> * [humble] Use rw_lock to protect mcap metadata lists. (backport #1561) (#1567) * Use rw_lock to protect mcap metadata lists. (#1561) * use rw_lock to protect mcap metadata lists. Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> * introduce MCAPStorage::write_lock_free private method. Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> --------- Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> (cherry picked from commit 90d1da8) # Conflicts: # rosbag2_storage_mcap/src/mcap_storage.cpp * Resolve merge conflicts Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> * Add /bigobj to MSVC compiles. (#1571) Signed-off-by: Chris Lalancette <clalancette@gmail.com> * Fix split by time. (backport #1022) (#1616) Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> * [humble] Add BagSplitInfo service call on bag close (backport #1422) (#1637) * Add BagSplitInfo service call on bag close (#1422) - Note: The `BagSplitInfo::opened_file` will have empty string to indicate that it was "bag close" and not bag split event. Signed-off-by: Michael Orlov <michael.orlov@apex.ai> (cherry picked from commit ba199d0) # Conflicts: # rosbag2_cpp/test/rosbag2_cpp/test_sequential_writer.cpp * Fix merge conflicts - Ensure that writer_ is destructed before intercepted fake_metadata_ Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> * [Humble] Resolve recording option problem (backport #1649) (#1651) * Resolve recording option problem (#1649) Signed-off-by: Barry Xu <barry.xu@sony.com> (cherry picked from commit 4914ab3) # Conflicts: # ros2bag/ros2bag/verb/record.py * Fix cherry-pick conflicts for mergify/bp/humble/pr-1649 (#1652) Signed-off-by: Barry Xu <barry.xu@sony.com> --------- Signed-off-by: Barry Xu <barry.xu@sony.com> Co-authored-by: Barry Xu <barry.xu@sony.com> * [humble] Add --log-level to ros2 bag play and record (#1655) * Add --log-level to ros2 bag play and record Co-authored-by: Michael Orlov <michael.orlov@apex.ai> Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com> * Fix missing import Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com> --------- Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> * [humble] Bugfix for writer not being able to open again after closing (backport #1599) (#1653) * [iron] Bugfix for writer not being able to open again after closing (backport #1599) (#1635) * re-applies fixes from #1590 to rolling. Also removes new message definition in sequential writer test for multiple open operations. Also clears topic_names_to_message_definitions_ and handles message_definitions_s underlying container similarly. Lastly, also avoids reset of factory in the compression writer, adds unit test there too. Signed-off-by: Yannick Schulz <yschulz854@gmail.com> Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * removes unused compressor_ member from compresser writer class. Also delegates rest of the closing behavior to the base class in close method, as it is handled in the open and write methods of the compression writer Signed-off-by: Yannick Schulz <yschulz854@gmail.com> * Remove unrelated delta - message_definitions_ was intentionally allocated on the stack and should persist between writer close() and open() because it represents cache for message definitions which is not changes. Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Don't call virtual methods from destructors Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Cleanup 'rosbag2_directory_next' after the test run Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Protect Writer::open(..) and Writer::close() with mutex on upper level - Rationale: To avoid race conditions if open(..) and close() could be ever be called from different threads. Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Bugfix for WRITE_SPLIT callback not called for the last compressed file Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Bugfix for lost messages from cache when closing compression writer Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Address build failure by using rcpputils::fs instead of std::filesystem - Note: On Iron we haven't migrated to the std::filesystem and using rcpputils::fs Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Adopt failing 'open_succeeds_twice' test for Iron Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Return from writer's open() immediately if storage already open Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Yannick Schulz <yschulz854@gmail.com> Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Yannick Schulz <yschulz854@gmail.com> (cherry picked from commit a360d9b) # Conflicts: # rosbag2_compression/src/rosbag2_compression/sequential_compression_writer.cpp # rosbag2_cpp/src/rosbag2_cpp/writer.cpp # rosbag2_cpp/src/rosbag2_cpp/writers/sequential_writer.cpp * Address merge conflicts Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Fix for segfault in open_twice test - Ensure that writer_ is destructed before intercepted fake_metadata_ Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Fix for "open_succeeds_twice" test failure on second run - Use std::filesystem for temp files and folders operation. For some reason rcpputils::fs::delete_all(folder_name) wasn't able to delete temp folder with subfolders. Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Adopt changes in TestRosbag2CPPAPI::minimal_writer_example for humble - The `serialized_msg2` is not owning the serialized data after the first call writer.write(serialized_msg2,..). i.e. need to use another message or another API in test. This is not a bug - this is by design. Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Signed-off-by: Audrow Nash <audrow@intrinsic.ai> Signed-off-by: Chris Lalancette <clalancette@gmail.com> Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> Signed-off-by: Barry Xu <barry.xu@sony.com> Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com> Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com> Co-authored-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com> Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com> Co-authored-by: Audrow Nash <audrow@openrobotics.org> Co-authored-by: Arne B <arne@rnae.de> Co-authored-by: DasRoteSkelett <matthias.schoepfer@googlemail.com> Co-authored-by: Chris Lalancette <clalancette@gmail.com> Co-authored-by: Barry Xu <barry.xu@sony.com> Co-authored-by: Roman <rsokolkov@gmail.com>
Notes for reviewers:
Recorder::record(..)
method for instance handling some service events before initiating recording. During those times signal handlers shall not be overridden.rclcpp::SignalHandlerOptions::None
andshutdown_on_signal
options since it doesn't have any effect because we are replacing signals with our own signal handlers even if they we installed before or if context has already been initialized before.