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

feat(ad_service_state_monitor)!: remove ad_service_state_monitor #2311

Merged

Conversation

isamu-takagi
Copy link
Contributor

@isamu-takagi isamu-takagi commented Nov 17, 2022

Description

Remove ad_service_state_monitor and add the autoware state node for compatibility. The functionality of ad_service_state_monitor has been reorganized into the autoware state node and the following packages.

  • state machine: /autoware/state is now converted in autoware state node from initialization state, routing state and operation mode provided by AD API
    • finalizing state: /autoware/shutdown service will continue to be supported in autoware state node.
    • arrived goal: The goal arrival check is moved to mission_planner package.
    • topic check: The topic rate check is moved to component_state_monitor package.
  • clear route: /autoware/reset_routeis removed. Use /api/routing/clear_route instead.
  • disengage_on_goal: The routing node in default_ad_api changes operation mode to stop when the vehicle goals.
  • disengage_on_route: The routing node in default_ad_api changes operation mode to stop when /api/routing/clear_route .

Related links

https://github.com/tier4/autoware_launch/pull/568

Tests performed

Using simple_planning_simulator.

  • Check if the vehicle can drive and if the state transitions as before.
  • Check if the operation mode will be stop when the vehicle goals.
  • Check if the operation mode will be stop when the route is cleared (while the vehicle is driving).
  • Check if the autoware state will be finalizing when /autoware/shutdown service is called.

Notes for reviewers

None

Pre-review checklist for the PR author

The PR author must check the checkboxes below when creating the PR.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

  • The PR follows the pull request guidelines.
  • The PR has been properly tested.
  • The PR has been reviewed by the code owners.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

  • There are no open discussions or they are tracked via tickets.
  • The PR is ready for merge.

After all checkboxes are checked, anyone who has write access can merge the PR.

isamu-takagi and others added 30 commits August 10, 2022 23:46
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
…ate.msg

Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>
…ate.msg

Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Copy link
Contributor

@kenji-miyake kenji-miyake left a comment

Choose a reason for hiding this comment

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

I've tested around the state and diagnostics, and it generally looks good to me.
One thing I'm concerned about is the sensing diagnostics are missing.

ros2 run rqt_runtime_monitor rqt_runtime_monitor --ros-args -r /diagnostics:=/diagnostics_err

image

ros2 topic echo /system/emergency/hazard_status --no-arr
stamp:
  sec: 1669011143
  nanosec: 386327711
status:
  level: 3
  emergency: true
  emergency_holding: false
  diag_no_fault: '<sequence type: diagnostic_msgs/msg/DiagnosticStatus, length: 29>'
  diag_safe_fault: '<sequence type: diagnostic_msgs/msg/DiagnosticStatus, length: 0>'
  diag_latent_fault: '<sequence type: diagnostic_msgs/msg/DiagnosticStatus, length: 0>'
  diag_single_point_fault: '<sequence type: diagnostic_msgs/msg/DiagnosticStatus, length: 2>'

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
@isamu-takagi
Copy link
Contributor Author

I've tested around the state and diagnostics, and it generally looks good to me.
One thing I'm concerned about is the sensing diagnostics are missing.

@kenji-miyake
This is because there is no rate check for sensing due to #2120 (comment). So I changed it to use DiscardAnalyzer.

@isamu-takagi
Copy link
Contributor Author

@kenji-miyake
Instead of discarding it, I now add at least one status for alive monitoring. 46d9d4a

@isamu-takagi isamu-takagi enabled auto-merge (squash) November 24, 2022 03:19
@isamu-takagi isamu-takagi merged commit 8a2015f into autowarefoundation:main Nov 24, 2022
@isamu-takagi isamu-takagi deleted the feature/ad-api/autoware-state branch November 24, 2022 05:11
mitsudome-r added a commit to mitsudome-r/autoware.universe that referenced this pull request Nov 29, 2022
soblin added a commit to soblin/autoware.universe that referenced this pull request Nov 30, 2022
soblin added a commit to soblin/autoware.universe that referenced this pull request Dec 5, 2022
…tor (autowarefoundation#2311)"

This reverts commit 8a2015f.

reverting HADMapRoute to LaneletRoute

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
soblin added a commit to soblin/autoware.universe that referenced this pull request Dec 5, 2022
…tor (autowarefoundation#2311)"

This reverts commit 8a2015f.

reverting HADMapRoute to LaneletRoute

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
HansRobo pushed a commit to HansRobo/autoware.universe that referenced this pull request Dec 16, 2022
…owarefoundation#2311)

* feat(autoware_ad_api_msgs): define operation mode interface

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat(default_ad_api): add operation mode api

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* fix: add message

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* Update common/autoware_ad_api_msgs/operation_mode/msg/OperationModeState.msg

Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>

* Update common/autoware_ad_api_msgs/operation_mode/msg/OperationModeState.msg

Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>

* fix: add message callback

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: add topic monitoring

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: use topic monitoring

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: modify topic monitoring config

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* fix: config name

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: modify diag name

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: move adapi message

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: change message type

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* fix: merge

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* WIP

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* fix: fix build error

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: move diagnostics

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: remove diagnostics

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: modify error message

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: remove unused code

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat(default_ad_api): add autoware state

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: reproduce old state

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: add shutdown service

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: change operation mode to stop

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: change operation mode to stop

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: remove ad_service_state_monitor

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: apply removing of ad_service_state_monitor

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* ci(pre-commit): autofix

* fix: remove comment for sync-file

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: discard sensing topic rate status

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* Revert "feat: discard sensing topic rate status"

This reverts commit 120d4f8.

* feat: add dummy topic rate check for alive monitoring

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* Revert "feat: add dummy topic rate check for alive monitoring"

This reverts commit 46d9d4a.

* feat: remove sensing alive monitoring

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>
kminoda pushed a commit to kminoda/autoware.universe that referenced this pull request Jan 6, 2023
…owarefoundation#2311)

* feat(autoware_ad_api_msgs): define operation mode interface

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat(default_ad_api): add operation mode api

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* fix: add message

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* Update common/autoware_ad_api_msgs/operation_mode/msg/OperationModeState.msg

Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>

* Update common/autoware_ad_api_msgs/operation_mode/msg/OperationModeState.msg

Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>

* fix: add message callback

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: add topic monitoring

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: use topic monitoring

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: modify topic monitoring config

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* fix: config name

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: modify diag name

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: move adapi message

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: change message type

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* fix: merge

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* WIP

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* fix: fix build error

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: move diagnostics

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: remove diagnostics

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: modify error message

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: remove unused code

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat(default_ad_api): add autoware state

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: reproduce old state

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: add shutdown service

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: change operation mode to stop

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: change operation mode to stop

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: remove ad_service_state_monitor

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: apply removing of ad_service_state_monitor

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* ci(pre-commit): autofix

* fix: remove comment for sync-file

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* feat: discard sensing topic rate status

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* Revert "feat: discard sensing topic rate status"

This reverts commit 120d4f8.

* feat: add dummy topic rate check for alive monitoring

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* Revert "feat: add dummy topic rate check for alive monitoring"

This reverts commit 46d9d4a.

* feat: remove sensing alive monitoring

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: kminoda <koji.minoda@tier4.jp>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:launch Launch files, scripts and initialization tools. (auto-assigned) component:system System design and integration. (auto-assigned) type:ci Continuous Integration (CI) processes and testing. (auto-assigned) type:documentation Creating or refining documentation. (auto-assigned)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants