Skip to content

Commit c8ccfea

Browse files
authored
Revert "Fix docker database flush_unused_database failed issue (#11600) (#11677)"
This reverts commit 7e4883e.
1 parent b8c6e2a commit c8ccfea

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

dockers/docker-database/docker-database-init.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ rm $db_cfg_file_tmp
7979

8080
# copy dump.rdb file to each instance for restoration
8181
DUMPFILE=/var/lib/redis/dump.rdb
82-
redis_inst_list=`/usr/bin/python3 -c "from swsscommon import swsscommon; print(' '.join(swsscommon.SonicDBConfig.getInstanceList().keys()))"`
82+
redis_inst_list=`/usr/bin/python3 -c "import swsssdk; print(' '.join(swsssdk.SonicDBConfig.get_instancelist().keys()))"`
8383
for inst in $redis_inst_list
8484
do
8585
mkdir -p /var/lib/$inst

dockers/docker-database/flush_unused_database

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ while(True):
1111
break
1212
time.sleep(1)
1313

14-
instlists = swsscommon.SonicDBConfig.getInstanceList()
14+
instlists = swsssdk.SonicDBConfig.get_instancelist()
1515
for instname, v in instlists.items():
16-
insthost = v.hostname
17-
instsocket = v.unixSocketPath
16+
insthost = v['hostname']
17+
instsocket = v['unix_socket_path']
1818

19-
dblists = swsscommon.SonicDBConfig.getDbList()
19+
dblists = swsssdk.SonicDBConfig.get_dblist()
2020
for dbname in dblists:
21-
dbid = swsscommon.SonicDBConfig.getDbId(dbname)
22-
dbinst = swsscommon.SonicDBConfig.getDbInst(dbname)
21+
dbid = swsssdk.SonicDBConfig.get_dbid(dbname)
22+
dbinst = swsssdk.SonicDBConfig.get_instancename(dbname)
2323

2424
# this DB is on current instance, skip flush
2525
if dbinst == instname:

0 commit comments

Comments
 (0)