Skip to content

Commit 7e4883e

Browse files
authored
Fix docker database flush_unused_database failed issue (#11600) (#11677)
Fix docker-database flush_unused_database failed issue: #11597 When change flush_unused_database from use swsssdk to use swsscommon, get_instancelist() and get_dblist() name changed but not update. Change flush_unused_database code to use swsscommon API: Change get_instancelist to getInstanceList. Change get_dblist to getDbList. Pass all E2E test. Manually check syslog make sure error log not exist and swss, syncd, bgp service started. Search code in Azure make sure there all similer case are fixed in this PR. <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 Fix docker-database flush_unused_database failed issue: #11597 When change flush_unused_database from use swsssdk to use swsscommon, get_instancelist() and get_dblist() name changed but not update. <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> Co-authored-by: liuh-80 <azureuser@liuh-dev-vm-02.5fg3zjdzj2xezlx1yazx5oxkzd.hx.internal.cloudapp.net> <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md ** Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it #### How I did it #### How to verify it #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
1 parent a9f2edd commit 7e4883e

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 "import swsssdk; print(' '.join(swsssdk.SonicDBConfig.get_instancelist().keys()))"`
82+
redis_inst_list=`/usr/bin/python3 -c "from swsscommon import swsscommon; print(' '.join(swsscommon.SonicDBConfig.getInstanceList().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 = swsssdk.SonicDBConfig.get_instancelist()
14+
instlists = swsscommon.SonicDBConfig.getInstanceList()
1515
for instname, v in instlists.items():
16-
insthost = v['hostname']
17-
instsocket = v['unix_socket_path']
16+
insthost = v.hostname
17+
instsocket = v.unixSocketPath
1818

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

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

0 commit comments

Comments
 (0)