Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[database] Fix docker-database flush_unused_database failed issue #11600

Merged
merged 1 commit into from
Aug 3, 2022
Merged

[database] Fix docker-database flush_unused_database failed issue #11600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/docker-database/docker-database-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ rm $db_cfg_file_tmp

# copy dump.rdb file to each instance for restoration
DUMPFILE=/var/lib/redis/dump.rdb
redis_inst_list=`/usr/bin/python3 -c "import swsssdk; print(' '.join(swsssdk.SonicDBConfig.get_instancelist().keys()))"`
redis_inst_list=`/usr/bin/python3 -c "from swsscommon import swsscommon; print(' '.join(swsscommon.SonicDBConfig.getInstanceList().keys()))"`
for inst in $redis_inst_list
do
mkdir -p /var/lib/$inst
Expand Down
12 changes: 6 additions & 6 deletions dockers/docker-database/flush_unused_database
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ while(True):
break
time.sleep(1)

instlists = swsscommon.SonicDBConfig.get_instancelist()
instlists = swsscommon.SonicDBConfig.getInstanceList()
for instname, v in instlists.items():
insthost = v['hostname']
instsocket = v['unix_socket_path']
insthost = v.hostname
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hostname

How easy if you fix on the SWIG side and keep app code unchanged?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That need make the RedisInstInfo become a dictionary, need about 40 lines code change, I make this change before and reverted:
sonic-net/sonic-swss-common@6a4a7b0

I can make that change if necessary.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary then.

instsocket = v.unixSocketPath

dblists = swsscommon.SonicDBConfig.get_dblist()
dblists = swsscommon.SonicDBConfig.getDbList()
for dbname in dblists:
dbid = swsscommon.SonicDBConfig.get_dbid(dbname)
dbinst = swsscommon.SonicDBConfig.get_instancename(dbname)
dbid = swsscommon.SonicDBConfig.getDbId(dbname)
dbinst = swsscommon.SonicDBConfig.getDbInst(dbname)

# this DB is on current instance, skip flush
if dbinst == instname:
Expand Down