-
Notifications
You must be signed in to change notification settings - Fork 331
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
Primary state error transitions #436
Open
thebyohazard
wants to merge
2
commits into
ros2:rolling
Choose a base branch
from
thebyohazard:lifecycle_primary_state_error_transitions
base: rolling
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -69,7 +69,7 @@ class LifecycleTalker : public rclcpp_lifecycle::LifecycleNode | |
* Callback for walltimer. This function gets invoked by the timer | ||
* and executes the publishing. | ||
* For this demo, we ask the node for its current state. If the | ||
* lifecycle publisher is not activate, we still invoke publish, but | ||
* lifecycle publisher is not activated, we still invoke publish, but | ||
* the communication is blocked so that no messages is actually transferred. | ||
*/ | ||
void | ||
|
@@ -88,6 +88,15 @@ class LifecycleTalker : public rclcpp_lifecycle::LifecycleNode | |
get_logger(), "Lifecycle publisher is active. Publishing: [%s]", msg->data.c_str()); | ||
} | ||
|
||
// Simulate the node having some error whilst active, | ||
// necessitating reconfiguration. | ||
// raise_error() can be called from an inactive or active state. | ||
if(count == 32){ | ||
RCLCPP_ERROR(get_logger(),"An error has arisen in the node and it needs reconfiguration."); | ||
raise_error(); | ||
return; | ||
} | ||
|
||
// We independently from the current state call publish on the lifecycle | ||
// publisher. | ||
// Only if the publisher is in an active state, the message transfer is | ||
|
@@ -262,6 +271,40 @@ class LifecycleTalker : public rclcpp_lifecycle::LifecycleNode | |
return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS; | ||
} | ||
|
||
/// Transition callback for state error processing | ||
/** | ||
* on_error callback is being called when the lifecycle node | ||
* enters the "errorProcessing" state. | ||
* Depending on the return value of this function, the state machine | ||
* either invokes a transition to the "unconfigured" state or the | ||
* finalized state. | ||
* TRANSITION_CALLBACK_SUCCESS transitions to "unconfigured" | ||
* TRANSITION_CALLBACK_FAILURE transitions to "finalized" | ||
* TRANSITION_CALLBACK_ERROR or any uncaught exceptions to "finalized" | ||
*/ | ||
rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn | ||
on_error(const rclcpp_lifecycle::State & state) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. indent is not correct? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks for that. Fixed |
||
{ | ||
// We explicitly deactivate the lifecycle publisher. | ||
// Starting from this point, all messages are no longer | ||
// sent into the network. | ||
timer_.reset(); | ||
pub_.reset(); | ||
|
||
RCUTILS_LOG_ERROR_NAMED( | ||
get_name(), | ||
"on error is called from state %s.", | ||
state.label().c_str()); | ||
|
||
// We return a success and hence invoke the transition to the next | ||
// step: "unconfigured". | ||
// If we returned TRANSITION_CALLBACK_FAILURE instead, the state machine | ||
// would go the "finalized" state. | ||
// In case of TRANSITION_CALLBACK_ERROR or any thrown exception within | ||
// this callback, the state machine also transitions to state "finalized". | ||
return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS; | ||
} | ||
|
||
private: | ||
// We hold an instance of a lifecycle publisher. This lifecycle publisher | ||
// can be activated or deactivated regarding on which state the lifecycle node | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
check if the current state in ACTIVE before raise_error() ?