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

[serial watchdog] remove serial watchdog service dependency to rc.local #1752

Merged
merged 2 commits into from
May 31, 2018

Conversation

yxieca
Copy link
Contributor

@yxieca yxieca commented May 30, 2018

- What I did
When restarting this service in rc.local, the dependency causes an error
in syslog. Removing the dependency to mute the error log entry.

- How to verify it
Tested with the change, the error entry is gone and the service is still running.

This following entry is no longer there:
May 30 13:53:01.672596 str-7260cx3-acs-1 ERR systemd[1]: [/etc/systemd/system/serial-port-watchdog.service:4] Failed to add dependency on rc.local.Service, ignoring: Invalid argument

Good syslog:
May 30 22:25:10.093548 str-7260cx3-acs-1 INFO systemd[1]: Starting Monitor serial port processes, kill stuck ones...
May 30 22:25:10.093562 str-7260cx3-acs-1 INFO serial-port-watchdog.py[657]: INFO: Attaching to syslog
May 30 22:25:10.093572 str-7260cx3-acs-1 INFO systemd[1]: Started Monitor serial port processes, kill stuck ones.
May 30 22:25:10.093783 str-7260cx3-acs-1 INFO rc.local[660]: + program_serial_port
May 30 22:25:10.093792 str-7260cx3-acs-1 INFO rc.local[660]: + sed -i s|ttyS.|ttyS0|g /etc/systemd/system/serial-port-watchdog.service
May 30 22:25:10.094187 str-7260cx3-acs-1 INFO kernel: [ 0.554314] serial8250: ttyS0 at I/O 0x3f8 (irq = 4, base_baud = 115200) is a 16550A
May 30 22:25:10.778167 str-7260cx3-acs-1 INFO rc.local[660]: + systemctl restart serial-port-watchdog.service
May 30 22:25:10.786660 str-7260cx3-acs-1 INFO systemd[1]: Stopping Monitor serial port processes, kill stuck ones...
May 30 22:25:11.157015 str-7260cx3-acs-1 INFO systemd[1]: Starting Monitor serial port processes, kill stuck ones...
May 30 22:25:11.285533 str-7260cx3-acs-1 INFO serial-port-watchdog.py[732]: INFO: Attaching to syslog
May 30 22:25:11.310412 str-7260cx3-acs-1 INFO systemd[1]: Started Monitor serial port processes, kill stuck ones.
root@str-7260cx3-acs-1:/var/log# ps -ef | grep serial
root 732 1 0 22:25 ? 00:00:00 python /usr/bin/serial-port-watchdog.py -t ttyS0

When restarting this service in rc.local, the dependency causes an error
in syslog. Removing the dependency to mute the error log entry.
@@ -1,7 +1,7 @@
[Unit]
Description=Monitor serial port processes, kill stuck ones
Requires=
Copy link
Collaborator

@qiluo-msft qiluo-msft May 30, 2018

Choose a reason for hiding this comment

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

Remove all empty config lines? #Closed

Copy link
Contributor Author

@yxieca yxieca May 30, 2018

Choose a reason for hiding this comment

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

aye aye sir! #Closed

@yxieca yxieca merged commit c105717 into sonic-net:master May 31, 2018
@yxieca yxieca deleted the watchdog branch May 31, 2018 01:29
@qiluo-msft
Copy link
Collaborator

Also cherry-pick on 201803 branch.

lguohan pushed a commit that referenced this pull request May 31, 2018
…al (#1752)

* [serial watchdog] remove serial watchdog service dependency to rc.local

When restarting this service in rc.local, the dependency causes an error
in syslog. Removing the dependency to mute the error log entry.

* remove lines with empty inputs
qiluo-msft added a commit to qiluo-msft/sonic-buildimage that referenced this pull request Jun 5, 2018
qiluo-msft added a commit that referenced this pull request Jun 5, 2018
* Revert "[serial watchdog] remove serial watchdog service dependency to rc.local (#1752)"
* Revert "[service] introducing serial port watchdog service (#1743)"
lguohan pushed a commit that referenced this pull request Jun 5, 2018
* Revert "[serial watchdog] remove serial watchdog service dependency to rc.local (#1752)"
* Revert "[service] introducing serial port watchdog service (#1743)"
volodymyrsamotiy added a commit to volodymyrsamotiy/sonic-buildimage that referenced this pull request May 28, 2021
dad1287 [tunneldecaporch] Set default MTU for the overlay loopback interface (sonic-net#1756)
1bc94d1 [orchagent] Fix typo in PortsOrch::initPortSupportedSpeeds (sonic-net#1755)
a44e651 [nhg]: Add support for weight in nexthop group member. (sonic-net#1752)
5c625b2 [Bulk mode] Limit the size of bulker (sonic-net#1744)
d1cd0fd Fix error msg due to not supported "SAI_SWITCH_ATTR_MAX_NUMBER_OF_TEMP_SENSORS"  attributes (sonic-net#1745)
278770d [sub intf] Fix kernel side processing to enslave sub interface to non-default vrf (sonic-net#1521)
031f536 support flush FDB entries per port and per vlan (sonic-net#1064)
3629d70 [sonic-swss] Add port auto negotiation support to swss (sonic-net#1714)
7c6ebb1 [fix] Use the same storm detection condition for queue occupancy non-zero case as the zero case (sonic-net#1111)
fb06c32 [fabricportsorch] Add fabric support (sonic-net#1459)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
liat-grozovik pushed a commit that referenced this pull request May 31, 2021
dad1287 [tunneldecaporch] Set default MTU for the overlay loopback interface (#1756)
1bc94d1 [orchagent] Fix typo in PortsOrch::initPortSupportedSpeeds (#1755)
a44e651 [nhg]: Add support for weight in nexthop group member. (#1752)
5c625b2 [Bulk mode] Limit the size of bulker (#1744)
d1cd0fd Fix error msg due to not supported "SAI_SWITCH_ATTR_MAX_NUMBER_OF_TEMP_SENSORS"  attributes (#1745)
278770d [sub intf] Fix kernel side processing to enslave sub interface to non-default vrf (#1521)
031f536 support flush FDB entries per port and per vlan (#1064)
3629d70 [sonic-swss] Add port auto negotiation support to swss (#1714)
7c6ebb1 [fix] Use the same storm detection condition for queue occupancy non-zero case as the zero case (#1111)
fb06c32 [fabricportsorch] Add fabric support (#1459)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
dad1287 [tunneldecaporch] Set default MTU for the overlay loopback interface (sonic-net#1756)
1bc94d1 [orchagent] Fix typo in PortsOrch::initPortSupportedSpeeds (sonic-net#1755)
a44e651 [nhg]: Add support for weight in nexthop group member. (sonic-net#1752)
5c625b2 [Bulk mode] Limit the size of bulker (sonic-net#1744)
d1cd0fd Fix error msg due to not supported "SAI_SWITCH_ATTR_MAX_NUMBER_OF_TEMP_SENSORS"  attributes (sonic-net#1745)
278770d [sub intf] Fix kernel side processing to enslave sub interface to non-default vrf (sonic-net#1521)
031f536 support flush FDB entries per port and per vlan (sonic-net#1064)
3629d70 [sonic-swss] Add port auto negotiation support to swss (sonic-net#1714)
7c6ebb1 [fix] Use the same storm detection condition for queue occupancy non-zero case as the zero case (sonic-net#1111)
fb06c32 [fabricportsorch] Add fabric support (sonic-net#1459)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
SuvarnaMeenakshi added a commit that referenced this pull request Aug 19, 2021
Why I did it
Update sonic-utilities submodule to include below commits:
29f4a16 Global and Interface commands for IPv6 Link local address enhancements (#1159)
a99d56d Improve config error handling on version_info (#1760)
5002745 Load the database global_db. (#1752)
Signed-off-by: Suvarna Meenakshi <sumeenak@microsoft.com>
judyjoseph added a commit that referenced this pull request Aug 26, 2021
88a38f7 Ignore ALREADY_EXIST error in FDB creation (#1815)
b1c23f3 Change rif_rates.lua and port_rates.lua scripts to calculate rates correct (#1848)

Update sonic-utilities submodule with

cbc25d6 [config reload] Call systemctl reset-failed for snmp,telemetry,mgmt-framework services (#1773)
04dcd07 Improve config error handling on version_info (#1760)
e567a60 Load the database global_db. (#1752)
c15fb8f [sfputil] Gracefully handle improper 'specification_compliance' field (#1741)
39350f8 [dhcp_relay] Update CLI reference document and add a new API for ip address type (#1717)
18f13c6 [sonic-package-manager] switch from poetry-semver to semantic_version due to bugs found in poetry-semver (#1710)
b16724a [voq][chassis] VOQ cli show commands implementation (#1689)
9427cd6 [debug dump util] Match Infrastructure (#1666)
d9fb39b [route_check] Filter out VNET routes (#1612)
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
* Add support for weight in nexthop group member.
1. In fpmsyncd, parse weight field in nlmsg, set APP_DB if weight is set.
2. In routeorch, collect weight and pass weight attribute to next hop group memeber object.

Signed-off-by: Zhenghui Cai <zcai@juniper.net>
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
…-net#1752)" (sonic-net#1798)

This reverts commit a44e651.

Proper weight initialization is needed when weights are not provided:
https://github.com/Azure/sonic-swss/blob/a44e6513556cfed7de1b70690db90cc09fcef666/orchagent/routeorch.cpp#L638

Warmboot is failing on various platforms: sonic-net#7919

The original PR needs some negative unit testcases when the weight is not present for the nexthop group.
taras-keryk pushed a commit to taras-keryk/sonic-buildimage that referenced this pull request Apr 28, 2022
What I did
Recent change was done to remove call to load database global_db which expects the clients to load global_db.
[sonic-net#8173]
The load global_db was missing in multi_asic.py which was causing "show interfaces cli" to fail.
While testing on multi-asic VS image:
How I did it
load global_db config in multi_asic.py.

How to verify it
Load multi-asic VS image with the fix.
Signed-off-by: Suvarna Meenakshi <sumeenak@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants