From 43f6df4654ed712621db7c816f7f8430b21c95ac Mon Sep 17 00:00:00 2001 From: Prince Sunny Date: Wed, 28 Nov 2018 21:58:59 -0800 Subject: [PATCH] Add nbrmgr to supervisor control (#2265) * Add nbrmgr to supervisord conf * Corrected priority values [Fix typo] * Submodule update for Neighbor manager daemon Submodule update sonic-swss-common: edbfeec - Remove default docker name value of swss. (#250) 9728462 - Corrected configDB name for neigh table (#251) 6decc65 - Add NEIGH_TABLE to configDB for neighbor configuration (#249) 9918ae6 - Add ProducerStateTable temp view implementation and UT (#247) 41408f2 - Update README on dependencies d9c0ba4 -Update README on the section 'Build with Google Test' bb7fa5b - [ut]: explicit convert is to bool type (#248) 661b82c - Add gtest instruction in README Submodule update sonic-swss 705b092 - Support ConfigDB neighbor configuration, introduce nbrmgr daemon (#693) 8522390 - Add vxlan switch attributes to switch orch (#712) b123fa0 - [schema] update WARM_RESTART_TABLE:process_name schema document (#707) 2d7ab0c - Revert "Align default MTU value as SAI default (#705)" (#710) 836a58c - Align default MTU value as SAI default (#705) bffa01f - VNET/VXLAN changes (#643) b750a4b - [watermarkorch] add watermarkorch, extend queue and pg counters with wat\u2026 (#629) --- dockers/docker-orchagent/start.sh | 2 ++ dockers/docker-orchagent/supervisord.conf | 8 ++++++++ platform/vs/docker-sonic-vs/start.sh | 2 ++ platform/vs/docker-sonic-vs/supervisord.conf | 8 ++++++++ src/sonic-swss | 2 +- src/sonic-swss-common | 2 +- 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh index 5733f9511a..d9e9bcad0b 100755 --- a/dockers/docker-orchagent/start.sh +++ b/dockers/docker-orchagent/start.sh @@ -41,6 +41,8 @@ supervisorctl start enable_counters supervisorctl start vrfmgrd +supervisorctl start nbrmgrd + # Start arp_update when VLAN exists VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'` if [ "$VLAN" != "" ]; then diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf index 13806a83ff..2fe25a7a41 100644 --- a/dockers/docker-orchagent/supervisord.conf +++ b/dockers/docker-orchagent/supervisord.conf @@ -127,3 +127,11 @@ startretries=0 stdout_logfile=syslog stderr_logfile=syslog +[program:nbrmgrd] +command=/usr/bin/nbrmgrd +priority=16 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog + diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index 6eec5b5dbc..3871dc375f 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -62,6 +62,8 @@ supervisorctl start buffermgrd supervisorctl start vrfmgrd +supervisorctl start nbrmgrd + # Start arp_update when VLAN exists VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'` if [ "$VLAN" != "" ]; then diff --git a/platform/vs/docker-sonic-vs/supervisord.conf b/platform/vs/docker-sonic-vs/supervisord.conf index 3435f24575..3fe3df30c2 100644 --- a/platform/vs/docker-sonic-vs/supervisord.conf +++ b/platform/vs/docker-sonic-vs/supervisord.conf @@ -164,3 +164,11 @@ startsecs=0 startretries=0 stdout_logfile=syslog stderr_logfile=syslog + +[program:nbrmgrd] +command=/usr/bin/nbrmgrd +priority=20 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog diff --git a/src/sonic-swss b/src/sonic-swss index c74dc6079f..705b092719 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit c74dc6079f49814ef290b65ed3e80b9cb27b310b +Subproject commit 705b092719384fa9fa86a952805bfc698092e0ff diff --git a/src/sonic-swss-common b/src/sonic-swss-common index 2a37c5c7c4..edbfeec663 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit 2a37c5c7c4fdcc607613a534f9d0daedadea1f10 +Subproject commit edbfeec663f32585cbf3468a88deb950fed3bb69