Skip to content

[Safety] Zero velocity should always be published on controller failure #5279

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 17, 2025
Merged

[Safety] Zero velocity should always be published on controller failure #5279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a92457
Publish zero velocitiy in case of goal failure
haider8645 Jun 16, 2025
a0b9c6f
Merge remote-tracking branch 'origin/main'
haider8645 Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nav2_controller/include/nav2_controller/controller_server.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class ControllerServer : public nav2_util::LifecycleNode
/**
* @brief Called on goal exit
*/
void onGoalExit();
void onGoalExit(bool force_stop);
/**
* @brief Checks if goal is reached
* @return true or false
Expand Down
33 changes: 16 additions & 17 deletions nav2_controller/src/controller_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@
if (controllers_[current_controller_]->cancel()) {
RCLCPP_INFO(get_logger(), "Cancellation was successful. Stopping the robot.");
action_server_->terminate_all();
onGoalExit();
onGoalExit(true);
return;
} else {
RCLCPP_INFO_THROTTLE(
Expand Down Expand Up @@ -513,71 +513,71 @@
}
} catch (nav2_core::InvalidController & e) {
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
onGoalExit();
onGoalExit(true);
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
result->error_code = Action::Result::INVALID_CONTROLLER;
result->error_msg = e.what();
action_server_->terminate_current(result);
return;
} catch (nav2_core::ControllerTFError & e) {
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
onGoalExit();
onGoalExit(true);
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
result->error_code = Action::Result::TF_ERROR;
result->error_msg = e.what();
action_server_->terminate_current(result);
return;
} catch (nav2_core::NoValidControl & e) {
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
onGoalExit();
onGoalExit(true);
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
result->error_code = Action::Result::NO_VALID_CONTROL;
result->error_msg = e.what();
action_server_->terminate_current(result);
return;
} catch (nav2_core::FailedToMakeProgress & e) {
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
onGoalExit();
onGoalExit(true);
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
result->error_code = Action::Result::FAILED_TO_MAKE_PROGRESS;
result->error_msg = e.what();
action_server_->terminate_current(result);
return;
} catch (nav2_core::PatienceExceeded & e) {
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
onGoalExit();
onGoalExit(true);
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
result->error_code = Action::Result::PATIENCE_EXCEEDED;
result->error_msg = e.what();
action_server_->terminate_current(result);
return;
} catch (nav2_core::InvalidPath & e) {
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
onGoalExit();
onGoalExit(true);
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
result->error_code = Action::Result::INVALID_PATH;
result->error_msg = e.what();
action_server_->terminate_current(result);
return;
} catch (nav2_core::ControllerTimedOut & e) {
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
onGoalExit();
onGoalExit(true);

Check warning on line 564 in nav2_controller/src/controller_server.cpp

View check run for this annotation

Codecov / codecov/patch

nav2_controller/src/controller_server.cpp#L564 

Added line #L564 was not covered by tests
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
result->error_code = Action::Result::CONTROLLER_TIMED_OUT;
result->error_msg = e.what();
action_server_->terminate_current(result);
return;
} catch (nav2_core::ControllerException & e) {
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
onGoalExit();
onGoalExit(true);
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
result->error_code = Action::Result::UNKNOWN;
result->error_msg = e.what();
action_server_->terminate_current(result);
return;
} catch (std::exception & e) {
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
onGoalExit();
onGoalExit(true);

Check warning on line 580 in nav2_controller/src/controller_server.cpp

View check run for this annotation

Codecov / codecov/patch

nav2_controller/src/controller_server.cpp#L580 

Added line #L580 was not covered by tests
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
result->error_code = Action::Result::UNKNOWN;
result->error_msg = e.what();
Expand All @@ -587,7 +587,7 @@

RCLCPP_DEBUG(get_logger(), "Controller succeeded, setting result");

onGoalExit();
onGoalExit(false);

// TODO(orduno) #861 Handle a pending preemption and set controller name
action_server_->succeeded_current();
Expand Down Expand Up @@ -775,16 +775,15 @@
publishVelocity(velocity);
}

void ControllerServer::onGoalExit()
void ControllerServer::onGoalExit(bool force_stop)
{
if (publish_zero_velocity_) {
if (publish_zero_velocity_ || force_stop) {
publishZeroVelocity();
}

// Reset the state of the controllers after the task has ended
ControllerMap::iterator it;
for (it = controllers_.begin(); it != controllers_.end(); ++it) {
it->second->reset();
// Reset controller state
for (auto & controller : controllers_) {
controller.second->reset();
}
}

Expand Down
Loading