From 0355caf20bb19bf39aca5f1059b0f509d71a7e09 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Wed, 17 Aug 2022 14:02:21 -0700
Subject: [PATCH] Added support to add gbsyncd in Feature Table of Host Config
 DB (#11754)

Why I did:

In case of multi-asic platforms gbsyncd is not getting added to Feature Table of Host Config DB. Without this container_checker complains of not needed gbsyncd container's are running.

How I did:
Update Both Host and Namespace config db when gbsyncd docker is starting.

How I verify:
Verified on Multi-asic platforms.
---
 files/scripts/gbsyncd.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/files/scripts/gbsyncd.sh b/files/scripts/gbsyncd.sh
index 0990de5d8257..a7eaaced0cd6 100755
--- a/files/scripts/gbsyncd.sh
+++ b/files/scripts/gbsyncd.sh
@@ -3,11 +3,15 @@
 . /usr/local/bin/syncd_common.sh
 
 function startplatform() {
-    # Add gbsyncd to FEATURE table, if not in. It did have same config as syncd.
-    if [ -z $($SONIC_DB_CLI CONFIG_DB HGET 'FEATURE|gbsyncd' state) ]; then
-        local CMD="local r=redis.call('DUMP', KEYS[1]); redis.call('RESTORE', KEYS[2], 0, r)"
-        $SONIC_DB_CLI CONFIG_DB EVAL "$CMD" 2 'FEATURE|syncd' 'FEATURE|gbsyncd'
-    fi
+
+    declare -a DbCliArray=($SONIC_DB_CLI $SONIC_DB_NS_CLI)
+    for DB_CLI in  ${DbCliArray[@]}; do
+        # Add gbsyncd to FEATURE table, if not in. It did have same config as syncd.
+        if [ -z $($DB_CLI CONFIG_DB HGET 'FEATURE|gbsyncd' state) ]; then
+            local CMD="local r=redis.call('DUMP', KEYS[1]); redis.call('RESTORE', KEYS[2], 0, r)"
+            $DB_CLI CONFIG_DB EVAL "$CMD" 2 'FEATURE|syncd' 'FEATURE|gbsyncd'
+        fi
+    done
 }
 
 function waitplatform() {
@@ -30,12 +34,11 @@ PEER="swss"
 DEBUGLOG="/tmp/swss-$SERVICE-debug$DEV.log"
 LOCKFILE="/tmp/swss-$SERVICE-lock$DEV"
 NAMESPACE_PREFIX="asic"
+SONIC_DB_CLI="sonic-db-cli"
+SONIC_DB_NS_CLI="sonic-db-cli"
 if [ "$DEV" ]; then
     NET_NS="$NAMESPACE_PREFIX$DEV" #name of the network namespace
-    SONIC_DB_CLI="sonic-db-cli -n $NET_NS"
-else
-    NET_NS=""
-    SONIC_DB_CLI="sonic-db-cli"
+    SONIC_DB_NS_CLI="sonic-db-cli -n $NET_NS"
 fi
 
 case "$1" in