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

Revert "Fix docker database flush_unused_database failed issue (#11600) (#11677)" (#12084)

Browse Source 
This reverts commit 7e4883e71f.
This commit is contained in:
Hua Liu 2022-09-16 05:19:56 +08:00 committed by GitHub
parent 1e034d5e86
commit e51368d789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ rm $db_cfg_file_tmp
# copy dump.rdb file to each instance for restoration # copy dump.rdb file to each instance for restoration
DUMPFILE=/var/lib/redis/dump.rdb DUMPFILE=/var/lib/redis/dump.rdb
redis_inst_list=`/usr/bin/python3 -c "from swsscommon import swsscommon; print(' '.join(swsscommon.SonicDBConfig.getInstanceList().keys()))"` redis_inst_list=`/usr/bin/python3 -c "import swsssdk; print(' '.join(swsssdk.SonicDBConfig.get_instancelist().keys()))"`
for inst in $redis_inst_list for inst in $redis_inst_list
do do
mkdir -p /var/lib/$inst mkdir -p /var/lib/$inst

12
dockers/docker-database/flush_unused_database
View File

@ -11,15 +11,15 @@ while(True):
break break
time.sleep(1) time.sleep(1)
instlists = swsscommon.SonicDBConfig.getInstanceList() instlists = swsssdk.SonicDBConfig.get_instancelist()
for instname, v in instlists.items(): for instname, v in instlists.items():
insthost = v.hostname insthost = v['hostname']
instsocket = v.unixSocketPath instsocket = v['unix_socket_path']
dblists = swsscommon.SonicDBConfig.getDbList() dblists = swsssdk.SonicDBConfig.get_dblist()
for dbname in dblists: for dbname in dblists:
dbid = swsscommon.SonicDBConfig.getDbId(dbname) dbid = swsssdk.SonicDBConfig.get_dbid(dbname)
dbinst = swsscommon.SonicDBConfig.getDbInst(dbname) dbinst = swsssdk.SonicDBConfig.get_instancename(dbname)
# this DB is on current instance, skip flush # this DB is on current instance, skip flush
if dbinst == instname: if dbinst == instname: