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.

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

Jump to bottom

fix(ntp_monitor): move chronyc command execution to a timer (backport #4634) #880

Merged
merged 1 commit into from
Sep 27, 2023
Merged

fix(ntp_monitor): move chronyc command execution to a timer (backport #4634) #880

merged 1 commit into from
Sep 27, 2023

Conversation

h-ohta
Copy link

@h-ohta h-ohta commented Sep 27, 2023 •
edited
Loading

Description

autowarefoundation#4634 のbackport
ntp_monitorにおいて、ネットワーク途絶などにより chronyc tracking の結果が返ってこない場合、

  • Before: diagの途絶し、STALEしていた
  • After: chronyc tracking の結果を timeout の秒数待って、それでも返ってこなければdiagをWarningとする。diag自体は別ループで回っていて、途絶はしないようにする

Related links

https://tier4.atlassian.net/browse/AEAP-668
https://github.com/tier4/autoware_launch.x1.eve/pull/429

Tests performed

以下の手順で動作を確認した

  1. https://github.com/tier4/autoware_launch.x1.eve/pull/429 も一緒に取り込み、ビルドする

  2. ntp_monitorを起動するために、system_launchを用いる
    ros2 launch system_launch system.launch.xml sensor_model:=aip_x1

  3. rqt_runtime_monitorを起動する
    ros2 run rqt_runtime_monitor rqt_runtime_monitor

  4. 通常時の動作を確認
    image

  5. 異常時の動作を確認、chronyc tracking を sleep 10 に変更する

    autoware.universe/system/system_monitor/src/ntp_monitor/ntp_monitor.cpp

    Line 188 in d1c5107

    bp::child c("chronyc tracking", bp::std_out > is_out);

image

Notes for reviewers

Interface changes

Effects on system behavior

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.

@ito-san @h-ohta
fix(ntp_monitor): move chronyc command execution to a timer (autoware…
d1c5107 
…foundation#4634)

* fix(ntp_monitor): move chronyc command execution to a timer

Signed-off-by: ito-san <fumihito.ito@tier4.jp>

* add newly added parameter timeout to config

---------

Signed-off-by: ito-san <fumihito.ito@tier4.jp>
Co-authored-by: Hiroki OTA <hiroki.ota@tier4.jp>
@h-ohta h-ohta marked this pull request as ready for review September 27, 2023 01:16
@h-ohta h-ohta changed the title fix(ntp_monitor): move chronyc command execution to a timer (#4634) fix(ntp_monitor): move chronyc command execution to a timer (backport #4634) Sep 27, 2023
asa-naki
asa-naki approved these changes Sep 27, 2023
View reviewed changes
Copy link

@asa-naki asa-naki left a comment

Choose a reason for hiding this comment

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

LGTM

@h-ohta h-ohta merged commit 2199f69 into beta/v0.3.17 Sep 27, 2023
9 of 10 checks passed
@h-ohta h-ohta deleted the backport/4634 branch September 27, 2023 12:56
@h-ohta
Copy link
Author

h-ohta commented Sep 28, 2023

@Mergifyio backport beta/v0.3.15.2

@mergify
Copy link

mergify bot commented Sep 28, 2023 •
edited
Loading

backport beta/v0.3.15.2

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Sep 28, 2023
@h-ohta @mergify
fix(ntp_monitor): move chronyc command execution to a timer (backport a…
cf289af 
…utowarefoundation#4634) (#880)

fix(ntp_monitor): move chronyc command execution to a timer (autowarefoundation#4634)

* fix(ntp_monitor): move chronyc command execution to a timer

* add newly added parameter timeout to config

---------

Signed-off-by: ito-san <fumihito.ito@tier4.jp>
Co-authored-by: ito-san <57388357+ito-san@users.noreply.github.com>
(cherry picked from commit 2199f69)
@mergify mergify bot mentioned this pull request Sep 28, 2023
Merged
h-ohta added a commit that referenced this pull request Sep 28, 2023
@mergify @h-ohta
fix(ntp_monitor): move chronyc command execution to a timer (backport a…
addb483 
…utowarefoundation#4634) (backport #880) (#885)

fix(ntp_monitor): move chronyc command execution to a timer (backport autowarefoundation#4634) (#880)

fix(ntp_monitor): move chronyc command execution to a timer (autowarefoundation#4634)

* fix(ntp_monitor): move chronyc command execution to a timer

* add newly added parameter timeout to config

---------

Signed-off-by: ito-san <fumihito.ito@tier4.jp>
Co-authored-by: ito-san <57388357+ito-san@users.noreply.github.com>
(cherry picked from commit 2199f69)

Co-authored-by: Hiroki OTA <hiroki.ota@tier4.jp>
asa-naki pushed a commit that referenced this pull request Aug 14, 2024
@h-ohta @ito-san @asa-naki
fix(ntp_monitor): move chronyc command execution to a timer (backport a…
ba1dbe7 
…utowarefoundation#4634) (#880)

fix(ntp_monitor): move chronyc command execution to a timer (autowarefoundation#4634)

* fix(ntp_monitor): move chronyc command execution to a timer



* add newly added parameter timeout to config

---------

Signed-off-by: ito-san <fumihito.ito@tier4.jp>
Co-authored-by: ito-san <57388357+ito-san@users.noreply.github.com>
This was referenced Aug 27, 2024
Closed
Merged
asa-naki added a commit that referenced this pull request Aug 29, 2024
@asa-naki @TakaHoribe
@pre-commit-ci @sfukuta @h-ohta @ito-san @Shin-kyoto @Owen-Liuyuxuan @takeshi-iwanari @kminoda @esteve
feat: resource check (#1496)
a5b62af 
* feat(system_error_monitor): manual modules (#793)

* feat(rviz_plugin): console meter is too large on the Rviz with FHD display, isn't it? (#587)

* feat(tier4_planning/vehicle_plugin): make plugins size scalable

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* remove space

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* scaling

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* change diag message

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* fix module name

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* add manual module and ignoring modules

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* Revert "feat(rviz_plugin): console meter is too large on the Rviz with FHD display, isn't it? (#587)"

This reverts commit f96169c.

* Revert "change diag message"

This reverts commit dff01ce.

* ci(pre-commit): autofix

* fix spell check

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* Revert "fix spell check"

This reverts commit 208aa1e.

* Revert "fix module name"

This reverts commit cec7653.

* revert ignore module

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* current_mode check update

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* ci(pre-commit): autofix

* delete margin

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

---------

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>
Co-authored-by: Takamasa Horibe <horibe.takamasa@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* feat(ad_service_state_monitor): change configs name (#876)

change configs name

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* feat(plannig_error_monitor): update error sharp angle threshold (#681)

* fix error_sharp_angle

Signed-off-by: Shigekazu Fukuta <shigekazu.fukuta@tier4.jp>

* update readme

Signed-off-by: Shigekazu Fukuta <shigekazu.fukuta@tier4.jp>

---------

Signed-off-by: Shigekazu Fukuta <shigekazu.fukuta@tier4.jp>

* fix: add error handling when path is invalid (#934)

* fix(behavior_path): delete duplicated

* add error handling

* fix: when path size is 1

* fix(detection_area): search collision index only in lanelet (#695)

* fix(detection_area): search collision index only in lanelet

* ci(pre-commit): autofix

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* fix(detection_area): fix overline function (#930)

* fix(detection_area): fix overline function

* ci(pre-commit): autofix

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* fix(route_handler): fix threshold for removing overlapping points (#1015)

* fix(route_handler): fix threshold for removing overlapping points

* fix

* fix(ntp_monitor): move chronyc command execution to a timer (backport autowarefoundation#4634) (#880)

fix(ntp_monitor): move chronyc command execution to a timer (autowarefoundation#4634)

* fix(ntp_monitor): move chronyc command execution to a timer



* add newly added parameter timeout to config

---------

Signed-off-by: ito-san <fumihito.ito@tier4.jp>
Co-authored-by: ito-san <57388357+ito-san@users.noreply.github.com>

* feat(elevation_map_loader): add error handling for std::runtime_error (backport autowarefoundation#4187) (#652)

feat(elevation_map_loader): add error handling for std::runtime_error (autowarefoundation#4187)

* feat(elevation_map_loader): Add error handling for std::runtime_error



* feat(elevation_map_loader): add error message output



---------

Signed-off-by: Shin-kyoto <58775300+Shin-kyoto@users.noreply.github.com>
Co-authored-by: Shintaro Tomie <58775300+Shin-kyoto@users.noreply.github.com>

* fix(system_monitor): extend command line to display (backport autowarefoundation#4553) (#768)

fix(system_monitor): extend command line to display (autowarefoundation#4553)

Signed-off-by: ito-san <fumihito.ito@tier4.jp>
Co-authored-by: ito-san <57388357+ito-san@users.noreply.github.com>

* fix(system_monitor): high-memory process are not provided in MEM order (backport autowarefoundation#4654) (#769)

fix(system_monitor): high-memory process are not provided in MEM order (autowarefoundation#4654)

* fix(process_monitor): high-memory process are not being provided in %MEM order



* changed option from 'g' to 'n'



---------

Signed-off-by: ito-san <fumihito.ito@tier4.jp>
Co-authored-by: ito-san <57388357+ito-san@users.noreply.github.com>

* fix(system_monitor): fix program command line reading (backport autowarefoundation#5191, autowarefoundation#5430) (#995)

* perf(system_monitor): fix program command line reading (autowarefoundation#5191)

* Fix program command line reading

Signed-off-by: Owen-Liuyuxuan <uken.ryu@tier4.jp>

* style(pre-commit): autofix

* fix spelling commandline->command_line

Signed-off-by: Owen-Liuyuxuan <uken.ryu@tier4.jp>

---------

Signed-off-by: Owen-Liuyuxuan <uken.ryu@tier4.jp>
Co-authored-by: Owen-Liuyuxuan <uken.ryu@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* fix(system_monitor): output command line (autowarefoundation#5430)

* fix(system_monitor): output command line

Signed-off-by: takeshi.iwanari <takeshi.iwanari@tier4.jp>

* style(pre-commit): autofix

---------

Signed-off-by: takeshi.iwanari <takeshi.iwanari@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

---------

Signed-off-by: Owen-Liuyuxuan <uken.ryu@tier4.jp>
Signed-off-by: takeshi.iwanari <takeshi.iwanari@tier4.jp>
Co-authored-by: Yuxuan Liu <619684051@qq.com>
Co-authored-by: Owen-Liuyuxuan <uken.ryu@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: takeshi-iwanari <takeshi.iwanari@tier4.jp>
Co-authored-by: Akihisa Nagata <54956813+asa-naki@users.noreply.github.com>

* feat(imu_corrector): add gyro_bias_validator (backport autowarefoundation#4729) (#856)

* feat(imu_corrector): add gyro_bias_validator (backport autowarefoundation#4729)
* feat(imu_corrector): add gyro_bias_validator
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* update
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* revert launch
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* updat
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* add debug publisher
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* minor fix
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* style(pre-commit): autofix
* add gtest
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* updat e readme
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* add diagnostics
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* update
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* validator -> estimator
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* fix build
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* update default parameter
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* update comment
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* update readme
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* updated
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* minor update in readme
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* fix pre-commit
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* update readme
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* style(pre-commit): autofix
* Fix NG -> WARN
Signed-off-by: kminoda <koji.minoda@tier4.jp>
---------
Signed-off-by: kminoda <koji.minoda@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* build(imu_corrector): add missing diagnostic_updater dependency (autowarefoundation#4980)

Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>

* add gyro_bias estimation in diag ( autowarefoundation#5054)

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* ci(pre-commit): autofix

---------

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
Co-authored-by: kminoda <44218668+kminoda@users.noreply.github.com>
Co-authored-by: Esteve Fernandez <33620+esteve@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* feat(imu_corrector): add gyro bias log (#918)

add gyro_bias log

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* feat(system_error_monitor): add ignore_until_waiting_for_route module (#888)

* add ignore_module

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* add description

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* ci(pre-commit): autofix

* change name ignore_until_waiting_for_route

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* update description

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* rename function name and delete planning state

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* update description

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* Update

---------

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Hiroki OTA <hiroki.ota@tier4.jp>

* feat(system_error_monitor): add ignore hartbeat timeout in initializing state (#972)

* add ignore hartbeat timeout in initializing state

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* fix typo

* Update comment

* ci(pre-commit): autofix

* fix typo

* ci(pre-commit): autofix

* update comment

* ci(pre-commit): autofix

---------

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

---------

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>
Signed-off-by: Shigekazu Fukuta <shigekazu.fukuta@tier4.jp>
Signed-off-by: ito-san <fumihito.ito@tier4.jp>
Signed-off-by: Shin-kyoto <58775300+Shin-kyoto@users.noreply.github.com>
Signed-off-by: Owen-Liuyuxuan <uken.ryu@tier4.jp>
Signed-off-by: takeshi.iwanari <takeshi.iwanari@tier4.jp>
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
Co-authored-by: Takamasa Horibe <horibe.takamasa@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Shigekazu Fukuta <107168699+sfukuta@users.noreply.github.com>
Co-authored-by: Hiroki OTA <hiroki.ota@tier4.jp>
Co-authored-by: ito-san <57388357+ito-san@users.noreply.github.com>
Co-authored-by: Shintaro Tomie <58775300+Shin-kyoto@users.noreply.github.com>
Co-authored-by: Yuxuan Liu <619684051@qq.com>
Co-authored-by: Owen-Liuyuxuan <uken.ryu@tier4.jp>
Co-authored-by: takeshi-iwanari <takeshi.iwanari@tier4.jp>
Co-authored-by: kminoda <44218668+kminoda@users.noreply.github.com>
Co-authored-by: Esteve Fernandez <33620+esteve@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asa-naki asa-naki asa-naki approved these changes

@KeisukeShima KeisukeShima Awaiting requested review from KeisukeShima

@yn-mrse yn-mrse Awaiting requested review from yn-mrse

@YoheiMishina YoheiMishina Awaiting requested review from YoheiMishina

@sfukuta sfukuta Awaiting requested review from sfukuta

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@h-ohta @asa-naki @ito-san