Skip to content

should pull valid transition before trying to change the state.#2774

Merged
ahcorde merged 2 commits intorollingfrom
fujitatomoya/call-rcl_lifecycle_get_transition_by_id
Mar 28, 2025
Merged

should pull valid transition before trying to change the state.#2774
ahcorde merged 2 commits intorollingfrom
fujitatomoya/call-rcl_lifecycle_get_transition_by_id

Conversation

@fujitatomoya
Copy link
Copy Markdown
Collaborator

@fujitatomoya fujitatomoya commented Mar 19, 2025 •
edited
Loading

i think this is just a simple oversight.
rcl_lifecycle_get_transition_by_id should be called to pull out the valid transition based on the current state, aligns with rcl_lifecycle_get_transition_by_label.

Note

backport to humble and jazzy required

@fujitatomoya
Copy link
Copy Markdown
Collaborator Author

fujitatomoya commented Mar 19, 2025

@jmachowinski can you take a look at this?

@fujitatomoya fujitatomoya self-assigned this Mar 19, 2025
@fujitatomoya fujitatomoya changed the title should pull valid transaction before trying to change the state. should pull valid transition before trying to change the state. Mar 19, 2025
@fujitatomoya
Copy link
Copy Markdown
Collaborator Author

fujitatomoya commented Mar 20, 2025

Pulls: #2774
Gist: https://gist.githubusercontent.com/fujitatomoya/799e61b6e25b24cde09431b6f146480a/raw/6379d3cc31a64d128c9fa837e16d8b0beceefb94/ros2.repos
BUILD args: --packages-above-and-dependencies rclcpp_lifecycle
TEST args: --packages-above rclcpp_lifecycle
ROS Distro: rolling
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/15432

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

@jmachowinski
Copy link
Copy Markdown
Collaborator

jmachowinski commented Mar 21, 2025

@jmachowinski can you take a look at this?

I had a short look, and it looks reasonable. That been said, I don't know enough about this part of the code, to give it a go though.
Sorry, I don't have spare time atm to look into this deeper, as I need to hunt down a customer bug...

@jmachowinski
Copy link
Copy Markdown
Collaborator

jmachowinski commented Mar 21, 2025

One remark though, if this fixes, a bug, can you add a unit test for it ?

@fujitatomoya
Copy link
Copy Markdown
Collaborator Author

fujitatomoya commented Mar 28, 2025

@jmachowinski tests are added, can you take a look and approve?

@fujitatomoya
should pull valid transaction before trying to change the state.
e6b54c4 
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
@fujitatomoya
add more test for lifecycle shutdown with id and label.
1105780 
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
@fujitatomoya fujitatomoya force-pushed the fujitatomoya/call-rcl_lifecycle_get_transition_by_id branch from 7607382 to 1105780 Compare March 28, 2025 07:00
@fujitatomoya
Copy link
Copy Markdown
Collaborator Author

fujitatomoya commented Mar 28, 2025

Pulls: #2774
Gist: https://gist.githubusercontent.com/fujitatomoya/aea7ae55d7169b8410a1f5be41523a01/raw/6379d3cc31a64d128c9fa837e16d8b0beceefb94/ros2.repos
BUILD args: --packages-above-and-dependencies rclcpp_lifecycle
TEST args: --packages-above rclcpp_lifecycle
ROS Distro: rolling
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/15509

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

@ahcorde ahcorde merged commit 7b6ee8a into rolling Mar 28, 2025
2 checks passed
@ahcorde ahcorde deleted the fujitatomoya/call-rcl_lifecycle_get_transition_by_id branch March 28, 2025 12:14
@ahcorde
Copy link
Copy Markdown
Contributor

ahcorde commented Mar 28, 2025

https://github.com/Mergifyio backport jazzy humble

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 28, 2025 •
edited
Loading

backport jazzy humble

✅ Backports have been created

Details

mergify bot pushed a commit that referenced this pull request Mar 28, 2025
@fujitatomoya @mergify
should pull valid transition before trying to change the state. (#2774)
56a4ddf 
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 7b6ee8a)

# Conflicts:
#	rclcpp_lifecycle/src/lifecycle_node_interface_impl.cpp
mergify bot pushed a commit that referenced this pull request Mar 28, 2025
@fujitatomoya @mergify
should pull valid transition before trying to change the state. (#2774)
835b745 
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 7b6ee8a)
This was referenced Mar 28, 2025
Merged
Merged
ahcorde pushed a commit that referenced this pull request Mar 28, 2025
@mergify @fujitatomoya
should pull valid transition before trying to change the state. (#2774)…
b6acdc9 
… (#2784)

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 7b6ee8a)

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
ahcorde pushed a commit that referenced this pull request Mar 31, 2025
@mergify
should pull valid transition before trying to change the state. (back…
c751dfb 
…port #2774) (#2785)

* should pull valid transition before trying to change the state. (#2774)

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 7b6ee8a)
jplapp pushed a commit to pixel-robotics/rclcpp that referenced this pull request Apr 9, 2025
@mergify @fujitatomoya @jplapp
should pull valid transition before trying to change the state. (ros2…
2a72856 
…#2774) (ros2#2784)

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 7b6ee8a)

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jmachowinski jmachowinski jmachowinski approved these changes

@mjcarroll mjcarroll Awaiting requested review from mjcarroll

@ahcorde ahcorde Awaiting requested review from ahcorde

Assignees

@fujitatomoya fujitatomoya

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fujitatomoya @jmachowinski @ahcorde