Skip to content

[pull] master from Azure:master#825

Merged
pull[bot] merged 4 commits intopphuchar:masterfrom
sonic-net:master
Jun 26, 2020
Merged

[pull] master from Azure:master#825
pull[bot] merged 4 commits intopphuchar:masterfrom
sonic-net:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Jun 26, 2020

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

pavel-shirshov and others added 4 commits June 25, 2020 14:54
* Tests for bgpcfgd templates
…r sonic-utilities. (#4850)

sonic-utils has sonic-yang-mgmt as build time deps, which inturn installs libyang.
libyang is needed to run newly added test.
If sonic-yang-mgmt is already built then libyang will not be installed in slave docker
without this PR and test will not run.

Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com
#4706)

**- Why I did it**
After discussed with Joe, we use the string "/usr/bin/syncd\s" in Monit configuration file to monitor 
syncd process on Broadcom and Mellanox. Due to my careless, I did not find this bug during the 
previous testing. If we use the string "/usr/bin/syncd" in Monit configuration file to monitor the 
syncd process, Monit will not detect whether syncd process is running or not. 

If we ran the command  `sudo monit procmactch “/usr/bin/syncd”` on Broadcom, there will be three 
processes in syncd container which matched this "/usr/bin/syncd": `/bin/bash /usr/bin/syncd.sh
wait`, `/usr/bin/dsserve /usr/bin/syncd –diag -u -p /etc/sai.d/sai.profile` and `/usr/bin/syncd –diag -
u -p /etc/sai.d/said.profile`. Monit will select the processes with the highest uptime (at there 
`/bin/bash /usr/bin/syncd.sh wait`) to match and did not select `/usr/bin/syncd –diag -u -p
/etc/sai.d/said.profile` to match. 

Similarly, On Mellanox Monit will also select the process with the highest uptime (at there 
`/bin/bash /usr/bin/syncd.sh wait`) to match and did not select `/usr/bin/syncd –diag -u -p
/etc/sai.d/said.profile` to match.

That is why Monit is unable to detect whether syncd process is running or not if we use the string “/usr/bin/syncd” in Monit configuration file. If we use the string "/usr/bin/syncd\s" in Monit configuration file, Monit can filter out the process `/bin/bash /usr/bin/syncd.sh wait` and thus can correctly monitor the syncd process.

**- How I did it**

**- How to verify it**

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
@pull pull bot added the ⤵️ pull label Jun 26, 2020
@pull pull bot merged commit b8ad0ed into pphuchar:master Jun 26, 2020
pphuchar pushed a commit that referenced this pull request Oct 27, 2020
…t#3112)

0ed90ba - [policerorch]: Fix return code comparison error (#968) (1 minutes ago) <Shuotian Cheng)
80fcada -  remove crm acl_counters when acl_table removed (#918) (3 hours ago) <JaredLius>
bd3651f - [aclorch]: Fix matching MIRROR_DSCP throws unnecessary errors (#966) (2 minutes ago) <Shuotian Cheng>
0af226a - [aclorch]: Add MIRROR_DSCP table type (#906) (4 weeks ago) <Shuotian Cheng>
9005962 - [vstest]: Update the mirror session state table name (#917) (5 weeks ago) <Shuotian Cheng>
c4e3e54 - [policerorch]: Add PolicerOrch to bundle with mirror session (#889) (6 weeks ago) <Shuotian Cheng>
ee49926 - [Makefile]: Remove header files from source files (#883) (8 weeks ago) <Shuotian Cheng>
f889f80 - [aclorch]: Add ICMP type/code match for v4/v6 (#868) (8 weeks ago) <Shuotian Cheng>
9931450 - [aclorch]: Add MIRRORv6 and MIRRORv4v6 support for ACL table (#825) (9 weeks ago) <Shuotian Cheng>
a1ab18c - [mirrororch]: Fix comments typo (#863) (9 weeks ago) <Shuotian Cheng>

sonic-swss-common
485db07 - [schema]: Add SWITCH_CAPABILITY_TABLE (#276) (6 weeks ago) <Shuotian Cheng>        
3f49b20 - [schema]: Add POLICER configuration table (#277) (6 weeks ago) <Shuotian Cheng>    
539b87d - [schema]: Add STATE_MIRROR_SESSION_TABLE_NAME (#278) (6 weeks ago) <Shuotian Cheng>

sonic-utilities
dc52015 - [Sonic-utilities]: Added commands to view acl and port running configs (#557) (6 days ago) <Prem Prakash>
635dc88 - [config]: Add config acl add/remove table command (#541) (4 weeks ago) <Shuotian Cheng>
dcdc922 - [show]: Add show policer command (#540) (4 weeks ago) <Shuotian Cheng>                                        
128462a - [config]: Add --policer option for mirror session (#537) (6 weeks ago) <Shuotian Cheng>                       
38da7f3 - [acl_loader]: Add policer attribute in show mirror_session command (#538) (6 weeks ago) <Shuotian Cheng>      
f95ff00 - [acl_loader]: Do not apply default DENY rule for MIRRORV6 table (#522) (6 weeks ago) <Shuotian Cheng>

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants