From 1eb3dfe5414587d763cf746f6483961095531b9b Mon Sep 17 00:00:00 2001 From: pavel-shirshov Date: Sat, 27 Jun 2020 01:22:23 -0700 Subject: [PATCH] [docker-teamd]: Introducing tlm_teamd: telemetry for teamd (#4824) **- What I did** 1. Updated submodule sonic-swss to bring tlm_teamd to the buildimage. 2. Updated supervisord for the teamd 3. Updated critical process list (not sure that tlm_teamd is critical for now) **- How to verify it** Build an image and run. Check that tlm_teamd is running and STATE_DB has information in the LAG_INTERFACE, and :LAG_MEMBER_INTERFACE ``` admin@sonic:~$ redis-cli -n 6 hgetall 'LAG_TABLE|PortChannel16' 1) "state" 2) "ok" 3) "team_device.ifinfo.dev_addr" 4) "4c:76:25:f5:48:80" 5) "setup.kernel_team_mode_name" 6) "loadbalance" 7) "team_device.ifinfo.ifindex" 8) "6" 9) "runner.fast_rate" 10) "false" 11) "runner.active" 12) "true" 13) "setup.pid" 14) "35" 15) "runner.fallback" 16) "false" ``` ``` admin@sonic:~$ redis-cli -n 6 hgetall 'LAG_MEMBER_TABLE|PortChannel16|Ethernet16' 1) "runner.selected" 2) "true" 3) "runner.aggregator.selected" 4) "true" 5) "runner.aggregator.id" 6) "26" 7) "runner.actor_lacpdu_info.state" 8) "61" 9) "runner.state" 10) "current" 11) "runner.actor_lacpdu_info.system" 12) "4c:76:25:f5:48:80" 13) "runner.partner_lacpdu_info.state" 14) "61" 15) "link.up" 16) "true" 17) "ifinfo.dev_addr" 18) "4c:76:25:f5:48:80" 19) "ifinfo.ifindex" 20) "26" 21) "link_watches.list.link_watch_0.up" 22) "true" 23) "runner.actor_lacpdu_info.port" 24) "17" 25) "runner.partner_lacpdu_info.port" 26) "1" 27) "runner.partner_lacpdu_info.system" 28) "52:54:00:ff:34:1b" ``` --- dockers/docker-teamd/critical_processes | 1 + dockers/docker-teamd/supervisord.conf | 11 +++++++++++ src/sonic-swss | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dockers/docker-teamd/critical_processes b/dockers/docker-teamd/critical_processes index 286d6aef4c7a..bb7d3c4b0810 100644 --- a/dockers/docker-teamd/critical_processes +++ b/dockers/docker-teamd/critical_processes @@ -1,2 +1,3 @@ program:teammgrd program:teamsyncd +program:tlm_teamd \ No newline at end of file diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf index 166b0be0f7dc..50d4249b1966 100644 --- a/dockers/docker-teamd/supervisord.conf +++ b/dockers/docker-teamd/supervisord.conf @@ -57,3 +57,14 @@ stdout_logfile=syslog stderr_logfile=syslog dependent_startup=true dependent_startup_wait_for=teammgrd:running + +[program:tlm_teamd] +command=/usr/bin/tlm_teamd +priority=4 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog +dependent_startup=true +dependent_startup_wait_for=start:exited + diff --git a/src/sonic-swss b/src/sonic-swss index a3a010af7283..17a2f93a545b 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit a3a010af728345b085d8a6e344b60b16c32815fd +Subproject commit 17a2f93a545b8669e44a62231c340ba518272ed7