matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[docker-database-init.sh]: Fix wrong creating of database_global.json in multi asic platform (#17221)

Browse Source 
Fix bug: #17161 (comment)
multi-asic platforms it will never go to the else part as DATABASE_TYPE is always ""


Microsoft ADO (number only): 25072889

Move the checker NAMESPACE_ID == "" back

Signed-off-by: Ze Gan <ganze718@gmail.com>
This commit is contained in:
Ze Gan 2023-11-22 01:41:20 +08:00 committed by GitHub
parent ee38e2447d
commit a87cddc6c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockers/docker-database/docker-database-init.sh
View File

@ -70,8 +70,8 @@ if [[ $DATABASE_TYPE == "chassisdb" ]]; then
exit 0 exit 0
fi fi
# copy/generate the database_global.json file if this is global database service in multi asic platform. # copy/generate the database_global.json file if this is global database service in multi asic/smart switch platform.
if [[ $DATABASE_TYPE == "" ]] && [[ $NAMESPACE_COUNT -gt 1 || $NUM_DPU -gt 1 ]] if [[ $NAMESPACE_ID == "" && $DATABASE_TYPE == "" && ( $NAMESPACE_COUNT -gt 1 || $NUM_DPU -gt 1) ]]
then then
if [ -f /etc/sonic/database_global.json ]; then if [ -f /etc/sonic/database_global.json ]; then
cp /etc/sonic/database_global.json $REDIS_DIR/sonic-db/database_global.json cp /etc/sonic/database_global.json $REDIS_DIR/sonic-db/database_global.json