e17e4fc4c0
[S6100] Improve S6100 serial-getty monitor, wait and re-check when getty not running to avoid false alert. #### Why I did it On S6100, the serial-getty service some time can't auto-restart by systemd. So there is a monit unit to check serial-getty service status and restart it. However, this monit will report false alert, because in most case when serial-getty not running, systemd can restart it successfully. To avoid the false alert, improve the monitor to wait and re-check. Steps to reproduce this issue: 1. User login to device via console, and keep the connection. 2. User login to device via SSH, check the serial-getty@ttyS1.service service, it's running. 3. Run 'monit reload' from SSH connection. 4. Check syslog 1 minutes later, there will be false alert: ' 'serial-getty' process is not running' #### How I did it Add check-getty.sh script to recheck again later when getty service not running. And update monit unit to check serial-getty service status with this script to avoid false alert. #### How to verify it Pass all UT. Manually check fixed code work correctly: ``` admin@***:~$ sudo systemctl stop serial-getty@ttyS1.service admin@***:~$ sudo /usr/local/bin/check-getty.sh admin@***:~$ echo $? 1 admin@***:~$ sudo systemctl status serial-getty@ttyS1.service ● serial-getty@ttyS1.service - Serial Getty on ttyS1 Loaded: loaded (/lib/systemd/system/serial-getty@.service; enabled-runtime; vendor preset: enabled) Active: inactive (dead) since Tue 2023-03-28 07:15:21 UTC; 1min 13s ago admin@***:~$ sudo /usr/local/bin/check-getty.sh admin@***:~$ echo $? 0 admin@***:~$ sudo systemctl status serial-getty@ttyS1.service ● serial-getty@ttyS1.service - Serial Getty on ttyS1 Loaded: loaded (/lib/systemd/system/serial-getty@.service; enabled-runtime; vendor preset: enabled) ``` syslog: ``` Mar 28 07:10:37.597458 *** INFO systemd[1]: serial-getty@ttyS1.service: Succeeded. Mar 28 07:12:43.010550 *** ERR monit[593]: 'serial-getty' status failed (1) -- no output Mar 28 07:12:43.010744 *** INFO monit[593]: 'serial-getty' trying to restart Mar 28 07:12:43.010846 *** INFO monit[593]: 'serial-getty' stop: '/bin/systemctl stop serial-getty@ttyS1.service' Mar 28 07:12:43.132172 *** INFO monit[593]: 'serial-getty' start: '/bin/systemctl start serial-getty@ttyS1.service' Mar 28 07:13:43.286276 *** INFO monit[593]: 'serial-getty' status succeeded (0) -- no output ``` #### Description for the changelog [S6100] Improve S6100 serial-getty monitor. #### Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
42 lines
2.3 KiB
Plaintext
42 lines
2.3 KiB
Plaintext
s6100/scripts/iom_power_*.sh usr/local/bin
|
|
s6100/scripts/s6100_platform.sh usr/local/bin
|
|
s6100/scripts/s6100_platform_startup.sh usr/local/bin
|
|
s6100/scripts/s6100_bitbang_reset.sh usr/local/bin
|
|
s6100/scripts/pcisysfs.py usr/bin
|
|
common/dell_i2c_utils.sh usr/local/bin
|
|
common/io_rd_wr.py usr/local/bin
|
|
common/nvram_rd_wr.py usr/local/bin
|
|
s6100/scripts/platform_reboot_override usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/fast-reboot_plugin usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/track_reboot_reason.sh usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/warm-reboot_plugin usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/soft-reboot_plugin usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/reboot_plugin usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/ssd-fw-upgrade usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/override.conf /etc/systemd/system/systemd-reboot.service.d
|
|
s6100/scripts/platform_fw_au_reboot_handle usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
common/dell_lpc_mon.sh usr/local/bin
|
|
s6100/scripts/s6100_ssd_mon.sh usr/local/bin
|
|
s6100/scripts/s6100_ssd_upgrade_status.sh usr/local/bin
|
|
common/actions.sh usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/platform_sensors.py usr/local/bin
|
|
s6100/scripts/platform_reboot_pre_check usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/hw-management-generate-dump.sh usr/bin
|
|
s6100/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
|
|
s6100/scripts/platform_watchdog_enable.sh usr/local/bin
|
|
s6100/scripts/platform_watchdog_disable.sh usr/local/bin
|
|
s6100/scripts/sensors usr/bin
|
|
s6100/scripts/iSMART_64 usr/local/bin
|
|
s6100/systemd/platform-modules-s6100.service etc/systemd/system
|
|
s6100/systemd/s6100-lpc-monitor.service etc/systemd/system
|
|
s6100/systemd/s6100-ssd-monitor.service etc/systemd/system
|
|
s6100/systemd/s6100-ssd-monitor.timer etc/systemd/system
|
|
s6100/systemd/s6100-ssd-upgrade-status.service etc/systemd/system
|
|
s6100/systemd/s6100-reboot-cause.service etc/systemd/system
|
|
s6100/systemd/s6100-platform-startup.service etc/systemd/system
|
|
s6100/scripts/s6100_serial_getty_monitor etc/monit/conf.d
|
|
s6100/scripts/check-getty.sh usr/local/bin
|
|
common/fw-updater usr/local/bin
|
|
common/onie_mode_set usr/local/bin
|
|
common/onie_version usr/local/bin
|