[Chassis][database][sonic-db-cli] Fix the instance database# failed to start up in LC (sonic-net#866)

mlok-nokia · web-flow · commit 5922fdc4cb55 · 2024-03-29T10:32:25.000-07:00
### Why I did it On multiasic LC, instance database# failed to start due to the sonic-db-cli -n asic# PING failed. soinc-db-cli -n asic0 PING failed which results in the /usr/bin/database.sh wait forever in the postStartAction(). Fixes sonic-net/sonic-buildimage#18395 #### How I did it On multiasic LC, sonic-db-cli -n asic0 PING has been fixed/changed by PR sonic-net/sonic-swss-common#797. But when execute "sonic-db-cli -n asic0 PING" command, it will fail to ping the CHASSIS_STATE_DB and CHASSIS_APP_DB in the database-chassis on the supervisor card. The existing code uses db_name to check against "redis_chassis.server" identify if it is for database-chassis is wrong. This commit uses variable "host" instead of db_name. This will fix the issue. #### How to verify it 1. Boot up the chassis, execuet " docker ps" to verify the instance database0 and database1 containers are up. ``` admin@ixre-egl-board40:~$ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES d2dc397d420a docker-macsec:latest "/usr/local/bin/supe?" 34 minutes ago Up 34 minutes macsec fd60a96fcb67 docker-snmp:latest "/usr/local/bin/supe?" 6 hours ago Up 6 hours snmp 168cf9ae286d docker-platform-monitor:latest "/usr/bin/docker_ini?" 6 hours ago Up 6 hours pmon 9f1c69112fdb docker-sonic-mgmt-framework:latest "/usr/local/bin/supe?" 6 hours ago Up 6 hours mgmt-framework 01cb833ab7b6 docker-lldp:latest "/usr/bin/docker-lld?" 6 hours ago Up 6 hours lldp1 ec6a965669eb docker-lldp:latest "/usr/bin/docker-lld?" 6 hours ago Up 6 hours lldp0 16dd25d29d7b docker-lldp:latest "/usr/bin/docker-lld?" 6 hours ago Up 6 hours lldp 46ce9b823873 docker-sonic-gnmi:latest "/usr/local/bin/supe?" 6 hours ago Up 6 hours gnmi 5f36560338e0 docker-fpm-frr:latest "/usr/bin/docker_ini?" 6 hours ago Up 6 hours bgp1 3b1abe66e7a1 docker-fpm-frr:latest "/usr/bin/docker_ini?" 6 hours ago Up 6 hours bgp0 85cd5b6cdd05 docker-router-advertiser:latest "/usr/bin/docker-ini?" 6 hours ago Up 6 hours radv ca8f79f69122 docker-teamd:latest "/usr/local/bin/supe?" 6 hours ago Up 6 hours teamd0 5fe4b55ac62e docker-syncd-brcm-dnx:latest "/usr/local/bin/supe?" 6 hours ago Up 6 hours syncd1 81b6ef493818 docker-syncd-brcm-dnx:latest "/usr/local/bin/supe?" 6 hours ago Up 6 hours syncd0 4e32dd244b65 docker-teamd:latest "/usr/local/bin/supe?" 6 hours ago Up 6 hours teamd1 4f83bee7ffba docker-orchagent:latest "/usr/bin/docker-ini?" 6 hours ago Up 6 hours swss0 4e2c047effa8 docker-orchagent:latest "/usr/bin/docker-ini?" 6 hours ago Up 6 hours swss1 0b6d7e742c0f docker-eventd:latest "/usr/local/bin/supe?" 6 hours ago Up 6 hours eventd 5c77bae968e0 docker-database:latest "/usr/local/bin/dock?" 6 hours ago Up 6 hours database1 d4616de64435 docker-database:latest "/usr/local/bin/dock?" 6 hours ago Up 6 hours database0 27403c8acffa docker-database:latest "/usr/local/bin/dock?" 6 hours ago Up 6 hours database ```
diff --git a/sonic-db-cli/sonic-db-cli.cpp b/sonic-db-cli/sonic-db-cli.cpp
@@ -49,7 +49,7 @@ string handleSingleOperation(
     try
     {
         auto db_id =  SonicDBConfig::getDbId(db_name, netns);
-        if (useUnixSocket && db_name != "redis_chassis.server")
+        if (useUnixSocket && host != "redis_chassis.server")
         {
             auto db_socket = SonicDBConfig::getDbSock(db_name, netns);
             message += db_name + ": Connection refused";
@@ -380,4 +380,4 @@ string getCommandName(vector<string>& commands)
     }
 
     return boost::to_upper_copy<string>(commands[0]);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ string handleSingleOperation(`
`49`	`49`	`try`
`50`	`50`	`{`
`51`	`51`	`auto db_id = SonicDBConfig::getDbId(db_name, netns);`
`52`		`- if (useUnixSocket && db_name != "redis_chassis.server")`
	`52`	`+ if (useUnixSocket && host != "redis_chassis.server")`
`53`	`53`	`{`
`54`	`54`	`auto db_socket = SonicDBConfig::getDbSock(db_name, netns);`
`55`	`55`	`message += db_name + ": Connection refused";`
`@@ -380,4 +380,4 @@ string getCommandName(vector<string>& commands)`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`return boost::to_upper_copy<string>(commands[0]);`
`383`		`-}`
	`383`	`+}`