From e51368d789f21b746451ca376e6736edcd0dbc27 Mon Sep 17 00:00:00 2001 From: Hua Liu <58683130+liuh-80@users.noreply.github.com> Date: Fri, 16 Sep 2022 05:19:56 +0800 Subject: [PATCH] Revert "Fix docker database flush_unused_database failed issue (#11600) (#11677)" (#12084) This reverts commit 7e4883e71f1ad627d3d4031ef820ac961aa24976. --- dockers/docker-database/docker-database-init.sh | 2 +- dockers/docker-database/flush_unused_database | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dockers/docker-database/docker-database-init.sh b/dockers/docker-database/docker-database-init.sh index 9b92b5890c2d..413bbc0b20df 100755 --- a/dockers/docker-database/docker-database-init.sh +++ b/dockers/docker-database/docker-database-init.sh @@ -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 "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 do mkdir -p /var/lib/$inst diff --git a/dockers/docker-database/flush_unused_database b/dockers/docker-database/flush_unused_database index cc69fc86eb72..e1f7394d9776 100755 --- a/dockers/docker-database/flush_unused_database +++ b/dockers/docker-database/flush_unused_database @@ -11,15 +11,15 @@ while(True): break time.sleep(1) -instlists = swsscommon.SonicDBConfig.getInstanceList() +instlists = swsssdk.SonicDBConfig.get_instancelist() for instname, v in instlists.items(): - insthost = v.hostname - instsocket = v.unixSocketPath + insthost = v['hostname'] + instsocket = v['unix_socket_path'] - dblists = swsscommon.SonicDBConfig.getDbList() + dblists = swsssdk.SonicDBConfig.get_dblist() for dbname in dblists: - dbid = swsscommon.SonicDBConfig.getDbId(dbname) - dbinst = swsscommon.SonicDBConfig.getDbInst(dbname) + dbid = swsssdk.SonicDBConfig.get_dbid(dbname) + dbinst = swsssdk.SonicDBConfig.get_instancename(dbname) # this DB is on current instance, skip flush if dbinst == instname: