From 4bb8ab349596117f36c782097b9a1b44e8f4f046 Mon Sep 17 00:00:00 2001
From: KISHORE KUNAL <64033340+kishorekunal01@users.noreply.github.com>
Date: Thu, 24 Dec 2020 18:36:01 -0800
Subject: [PATCH] Add support to start fdbsyncd when orchagent docker starts
 (#5979)

Add support to start fdbsyncd when swss docker starts.
New demon is added to sync MAC from Kernel to DB and vise versa.
---
 dockers/docker-orchagent/base_image_files/monit_swss |  4 ++++
 dockers/docker-orchagent/critical_processes          |  1 +
 dockers/docker-orchagent/supervisord.conf            | 11 +++++++++++
 platform/p4/docker-sonic-p4/start.sh                 |  3 +++
 platform/p4/docker-sonic-p4/supervisord.conf         |  8 ++++++++
 platform/vs/docker-sonic-vs/start.sh                 |  2 ++
 platform/vs/docker-sonic-vs/supervisord.conf         |  9 +++++++++
 7 files changed, 38 insertions(+)

diff --git a/dockers/docker-orchagent/base_image_files/monit_swss b/dockers/docker-orchagent/base_image_files/monit_swss
index 7557bd66ac..38862f348b 100644
--- a/dockers/docker-orchagent/base_image_files/monit_swss
+++ b/dockers/docker-orchagent/base_image_files/monit_swss
@@ -4,6 +4,7 @@
 ##  orchagent
 ##  portsyncd
 ##  neighsyncd
+##  fdbsyncd
 ##  vrfmgrd
 ##  vlanmgrd
 ##  intfmgrd
@@ -22,6 +23,9 @@ check program swss|portsyncd with path "/usr/bin/process_checker swss /usr/bin/p
 check program swss|neighsyncd with path "/usr/bin/process_checker swss /usr/bin/neighsyncd"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
 
+check program swss|fdbsyncd with path "/usr/bin/process_checker swss /usr/bin/fdbsyncd"
+    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
+
 check program swss|vrfmgrd with path "/usr/bin/process_checker swss /usr/bin/vrfmgrd"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
 
diff --git a/dockers/docker-orchagent/critical_processes b/dockers/docker-orchagent/critical_processes
index 809693684c..d2dc86a5f7 100644
--- a/dockers/docker-orchagent/critical_processes
+++ b/dockers/docker-orchagent/critical_processes
@@ -1,6 +1,7 @@
 program:orchagent
 program:portsyncd
 program:neighsyncd
+program:fdbsyncd
 program:vlanmgrd
 program:intfmgrd
 program:portmgrd
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index 4d60606a81..f1b8edd622 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -184,3 +184,14 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=swssconfig:exited
+
+[program:fdbsyncd]
+command=/usr/bin/fdbsyncd
+priority=17
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
diff --git a/platform/p4/docker-sonic-p4/start.sh b/platform/p4/docker-sonic-p4/start.sh
index e3251bb2f4..2da8fe2249 100755
--- a/platform/p4/docker-sonic-p4/start.sh
+++ b/platform/p4/docker-sonic-p4/start.sh
@@ -58,6 +58,9 @@ supervisorctl start portsyncd
 echo "Start neighsyncd"
 supervisorctl start neighsyncd
 
+echo "Start fdbsyncd"
+supervisorctl start fdbsyncd
+
 echo "Start teamsyncd"
 supervisorctl start teamsyncd
 
diff --git a/platform/p4/docker-sonic-p4/supervisord.conf b/platform/p4/docker-sonic-p4/supervisord.conf
index 946e4cb36e..a4026f61c1 100644
--- a/platform/p4/docker-sonic-p4/supervisord.conf
+++ b/platform/p4/docker-sonic-p4/supervisord.conf
@@ -131,3 +131,11 @@ autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
 stderr_logfile=syslog
+
+[program:fdbsyncd]
+command=/usr/bin/fdbsyncd
+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 3d349a4ad1..1c0960e598 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -103,6 +103,8 @@ supervisorctl start coppmgrd
 
 supervisorctl start neighsyncd
 
+supervisorctl start fdbsyncd
+
 supervisorctl start teamsyncd
 
 supervisorctl start fpmsyncd
diff --git a/platform/vs/docker-sonic-vs/supervisord.conf b/platform/vs/docker-sonic-vs/supervisord.conf
index 3312bad480..61fdb60bcc 100644
--- a/platform/vs/docker-sonic-vs/supervisord.conf
+++ b/platform/vs/docker-sonic-vs/supervisord.conf
@@ -220,3 +220,12 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+
+[program:fdbsyncd]
+command=/usr/bin/fdbsyncd
+priority=25
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+